diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md index 650c68185681cbf489c65a2404c4897bee2844fc..7705479f0ddef6ab1eeb57d2e5bd7a392c06e7ea 100644 --- a/docs/usage/self-hosted-configuration.md +++ b/docs/usage/self-hosted-configuration.md @@ -136,7 +136,7 @@ But you can tell Renovate to use "sidecar" containers for third-party tools by s For this to work, `docker` needs to be installed and the Docker socket available to Renovate. Now Renovate uses `docker run` to create containers like Node.js or Python to run tools in as-needed. -Additionally, when Renovate is run inside a container built using [`containerbase/buildpack`](https://github.com/containerbase/buildpack), such as the official Renovate images on Docker Hub, then `binarySource=install` can be used. +Additionally, when Renovate is run inside a container built using [`containerbase`](https://github.com/containerbase), such as the official Renovate images on Docker Hub, then `binarySource=install` can be used. This mode means that Renovate will dynamically install the version of tools available, if supported. Supported tools for dynamic install are: diff --git a/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap index 8665bf8265b4677bad8f451aafe53020815c0c56..0e118b4b39a799e6d3bdb67db3d8dd99f9eece86 100644 --- a/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/cargo/__snapshots__/artifacts.spec.ts.snap @@ -89,7 +89,7 @@ exports[`modules/manager/cargo/artifacts returns updated Cargo.lock with docker "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", diff --git a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap index 44f1cc6619ccff8ed8e03854df6986b8f428901a..a6d1f99da0d789349fa01c750ba3d242f0c6da32 100644 --- a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap @@ -14,7 +14,7 @@ exports[`modules/manager/cocoapods/artifacts dynamically selects Docker image ta "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -44,7 +44,7 @@ exports[`modules/manager/cocoapods/artifacts falls back to the \`latest\` Docker "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -140,7 +140,7 @@ exports[`modules/manager/cocoapods/artifacts returns updated Podfile 2`] = ` "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -202,7 +202,7 @@ exports[`modules/manager/cocoapods/artifacts returns updated Podfile and Pods fi "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", diff --git a/lib/modules/manager/composer/artifacts.spec.ts b/lib/modules/manager/composer/artifacts.spec.ts index b0ebaf7832019b129318bf9ea30f585a2aa5e2a3..6909b90acf31dcc22c28e1b7bc1d15e7b4193183 100644 --- a/lib/modules/manager/composer/artifacts.spec.ts +++ b/lib/modules/manager/composer/artifacts.spec.ts @@ -369,7 +369,7 @@ describe('modules/manager/composer/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/buildpack', + BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', COMPOSER_CACHE_DIR: '/tmp/renovate/cache/others/composer', }, }, @@ -425,7 +425,7 @@ describe('modules/manager/composer/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/buildpack', + BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', COMPOSER_CACHE_DIR: '/tmp/renovate/cache/others/composer', }, }, diff --git a/lib/modules/manager/flux/readme.md b/lib/modules/manager/flux/readme.md index 7223c9b6e3a395bc2319d35f9bfd01c800b411db..d138ac5cff5e8f434cd1f2f75db4947a9dd30bcd 100644 --- a/lib/modules/manager/flux/readme.md +++ b/lib/modules/manager/flux/readme.md @@ -19,7 +19,7 @@ Namespaces will not be inferred from the context (e.g. from the parent `Kustomiz Updating system manifests requires that either: 1. The `flux` tool is pre-installed, or -2. You run a Docker image based on [containerbase/buildpack](https://github.com/containerbase/buildpack), such as the official Renovate images, and have `binarySource=install` configured +2. You run a Docker image based on [containerbase](https://github.com/containerbase), such as the official Renovate images, and have `binarySource=install` configured By default, the `flux` manager will only match `flux-system/gotk-components.yaml` (i.e. system manifest) files. This is because there is no commonly accepted file/directory naming convention for Flux manifests and we don't want to check every single `*.yaml` file in repositories just in case some of them have Flux definitions. diff --git a/lib/modules/manager/gomod/artifacts.spec.ts b/lib/modules/manager/gomod/artifacts.spec.ts index 4dcee367a55d84449e07a2d309d91269bf411080..a8069bc086cf54afa8a61a4028b8948a28ab817f 100644 --- a/lib/modules/manager/gomod/artifacts.spec.ts +++ b/lib/modules/manager/gomod/artifacts.spec.ts @@ -306,7 +306,7 @@ describe('modules/manager/gomod/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/buildpack', + BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', }, }, }, @@ -345,7 +345,7 @@ describe('modules/manager/gomod/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/buildpack', + BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', }, }, }, @@ -460,7 +460,7 @@ describe('modules/manager/gomod/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/buildpack', + BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', GIT_CONFIG_COUNT: '6', GIT_CONFIG_KEY_0: 'url.https://ssh:some-token@github.com/.insteadOf', diff --git a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap index 769bcb661165b02b65ce57fc9c2e2fa80368a45f..b0ecb5b0905e43d541a1966d138b7385d47dc8b7 100644 --- a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap @@ -574,7 +574,7 @@ exports[`modules/manager/helmv3/artifacts returns updated Chart.lock with docker "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HELM_EXPERIMENTAL_OCI": "1", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -734,7 +734,7 @@ exports[`modules/manager/helmv3/artifacts sets repositories from registryAliases "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HELM_EXPERIMENTAL_OCI": "1", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", diff --git a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap index 5baa5ac152c0279d48b63060aa4a30856eb31b6f..b246826183bd53cad104e8b7ae9a294d0df9fe70 100644 --- a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap @@ -26,7 +26,7 @@ exports[`modules/manager/mix/artifacts authenticates to private repositories 2`] "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -85,7 +85,7 @@ exports[`modules/manager/mix/artifacts returns updated mix.lock 1`] = ` "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", diff --git a/lib/modules/manager/nuget/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/nuget/__snapshots__/artifacts.spec.ts.snap index 6e5a9905768cd6ded24f08c53f645fa3741db1d6..201b72e37074cde5ec662fa7fc1b5a4e2de9edae 100644 --- a/lib/modules/manager/nuget/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/nuget/__snapshots__/artifacts.spec.ts.snap @@ -154,7 +154,7 @@ exports[`modules/manager/nuget/artifacts supports docker mode 1`] = ` "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", diff --git a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap index 2c5bdfa64fa001de07b41b438f9180a25138b25f..03abf52d6bfd5b95c5b6506434b44a3f9eb9e5fb 100644 --- a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap @@ -116,7 +116,7 @@ exports[`modules/manager/pipenv/artifacts supports docker mode 1`] = ` "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -154,7 +154,7 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile 1`] = "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -191,7 +191,7 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile dev p "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", @@ -228,7 +228,7 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from config 1`] = "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/buildpack", + "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com", diff --git a/lib/util/exec/buildpack.spec.ts b/lib/util/exec/containerbase.spec.ts similarity index 97% rename from lib/util/exec/buildpack.spec.ts rename to lib/util/exec/containerbase.spec.ts index 42286dc8a2672a96c95951fd1bcdb6acea1388e3..19646bc93104b839f5defb7fc569dc095923c6f8 100644 --- a/lib/util/exec/buildpack.spec.ts +++ b/lib/util/exec/containerbase.spec.ts @@ -5,14 +5,14 @@ import { generateInstallCommands, isDynamicInstall, resolveConstraint, -} from './buildpack'; +} from './containerbase'; import type { ToolConstraint } from './types'; jest.mock('../../modules/datasource'); const datasource = mocked(_datasource); -describe('util/exec/buildpack', () => { +describe('util/exec/containerbase', () => { describe('isDynamicInstall()', () => { beforeEach(() => { GlobalConfig.reset(); @@ -23,7 +23,7 @@ describe('util/exec/buildpack', () => { expect(isDynamicInstall()).toBeFalse(); }); - it('returns false if not buildpack', () => { + it('returns false if not containerbase', () => { GlobalConfig.set({ binarySource: 'install' }); expect(isDynamicInstall()).toBeFalse(); }); diff --git a/lib/util/exec/buildpack.ts b/lib/util/exec/containerbase.ts similarity index 99% rename from lib/util/exec/buildpack.ts rename to lib/util/exec/containerbase.ts index da660dee0b2d2d7d35ea2b4e315d2d5bfd0f7024..8679779fc5488bbfccefc3953212e68bd6a262fa 100644 --- a/lib/util/exec/buildpack.ts +++ b/lib/util/exec/containerbase.ts @@ -125,7 +125,7 @@ export function isDynamicInstall( } if (!isBuildpack()) { logger.warn( - 'binarySource=install is only compatible with images derived from containerbase/buildpack' + 'binarySource=install is only compatible with images derived from github.com/containerbase' ); return false; } diff --git a/lib/util/exec/index.spec.ts b/lib/util/exec/index.spec.ts index 7be986fc04cc9606a5487eb74c61c1ddced76b61..6180248684fe92334714cc7e467c34b561a3b12e 100644 --- a/lib/util/exec/index.spec.ts +++ b/lib/util/exec/index.spec.ts @@ -76,11 +76,11 @@ describe('util/exec/index', () => { const buildpackEnv = { ...envMock.basic, - BUILDPACK_CACHE_DIR: `${cacheDir}buildpack`, + BUILDPACK_CACHE_DIR: `${cacheDir}containerbase`, }; const buildpackEnvFiltered = { ...envMock.filtered, - BUILDPACK_CACHE_DIR: `${cacheDir}buildpack`, + BUILDPACK_CACHE_DIR: `${cacheDir}containerbase`, }; const testInputs: [string, TestInput][] = [ diff --git a/lib/util/exec/index.ts b/lib/util/exec/index.ts index d5883f478d5a5ca4c56022f480a71eaef70c6c63..055a99672bd6a92dbc4ca08184c81ba676ed1433 100644 --- a/lib/util/exec/index.ts +++ b/lib/util/exec/index.ts @@ -3,8 +3,8 @@ import upath from 'upath'; import { GlobalConfig } from '../../config/global'; import { TEMPORARY_ERROR } from '../../constants/error-messages'; import { logger } from '../../logger'; -import { generateInstallCommands, isDynamicInstall } from './buildpack'; import { rawExec } from './common'; +import { generateInstallCommands, isDynamicInstall } from './containerbase'; import { generateDockerCommand, removeDockerContainer } from './docker'; import { getChildProcessEnv } from './env'; import { getHermitEnvs, isHermit } from './hermit'; @@ -104,7 +104,7 @@ async function prepareRawExec( const { customEnvVariables, cacheDir, binarySource } = GlobalConfig.get(); if (binarySource === 'docker' || binarySource === 'install') { - const buildPackCacheDir = upath.join(cacheDir, 'buildpack'); + const buildPackCacheDir = upath.join(cacheDir, 'containerbase'); opts.env ??= {}; opts.env.BUILDPACK_CACHE_DIR = buildPackCacheDir; } @@ -137,7 +137,7 @@ async function prepareRawExec( ); rawCommands = [dockerCommand]; } else if (isDynamicInstall(opts.toolConstraints)) { - logger.debug('Using buildpack dynamic installs'); + logger.debug('Using containerbase dynamic installs'); rawCommands = [ ...(await generateInstallCommands(opts.toolConstraints)), ...(opts.preCommands ?? []), diff --git a/lib/workers/global/initialize.spec.ts b/lib/workers/global/initialize.spec.ts index f0ba565956eb04acf83f80e3721f585146dd3300..3a7ce466111a2e1b131ca255ec5fc2bde55635e3 100644 --- a/lib/workers/global/initialize.spec.ts +++ b/lib/workers/global/initialize.spec.ts @@ -24,7 +24,7 @@ describe('workers/global/initialize', () => { await expect(globalInitialize(config)).toResolve(); }); - it('supports buildpack', async () => { + it('supports containerbase', async () => { const config: AllConfig = { binarySource: 'docker' }; git.validateGitVersion.mockResolvedValueOnce(true); await expect(globalInitialize(config)).toResolve(); diff --git a/lib/workers/global/initialize.ts b/lib/workers/global/initialize.ts index c0ec8e4338432d7bce68ed7abb1b45d43a30d4d8..dd928c1fa23de528e41bf232a7d05e3022e98401 100644 --- a/lib/workers/global/initialize.ts +++ b/lib/workers/global/initialize.ts @@ -29,7 +29,7 @@ async function setDirectories(input: AllConfig): Promise<AllConfig> { } await fs.ensureDir(config.cacheDir); if (config.binarySource === 'docker' || config.binarySource === 'install') { - await fs.ensureDir(upath.join(config.cacheDir, 'buildpack')); + await fs.ensureDir(upath.join(config.cacheDir, 'containerbase')); } return config; }