diff --git a/lib/modules/manager/bundler/artifacts.spec.ts b/lib/modules/manager/bundler/artifacts.spec.ts index d131b7d5d3ec82d18b2ef257298eaaf43ab45744..225205793e366655293e69f838e5c5babf0ebd62 100644 --- a/lib/modules/manager/bundler/artifacts.spec.ts +++ b/lib/modules/manager/bundler/artifacts.spec.ts @@ -288,7 +288,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -348,7 +347,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -410,7 +408,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -472,7 +469,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/cache":"/tmp/cache" ' + '-e BUNDLE_GEMS__PRIVATE__COM ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -542,7 +538,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -614,7 +609,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -685,7 +679,6 @@ describe('modules/manager/bundler/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GEM_HOME ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/cargo/artifacts.spec.ts b/lib/modules/manager/cargo/artifacts.spec.ts index 99b32f0f359135e3445ce98a314b2c35dcd2083d..5850ba51b38dc8504364a62a02eb4b3a6bdb6c46 100644 --- a/lib/modules/manager/cargo/artifacts.spec.ts +++ b/lib/modules/manager/cargo/artifacts.spec.ts @@ -12,7 +12,7 @@ jest.mock('../../../util/git'); jest.mock('../../../util/http'); jest.mock('../../../util/fs'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const config: UpdateArtifactsConfig = {}; @@ -218,7 +218,6 @@ describe('modules/manager/cargo/artifacts', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -230,7 +229,6 @@ describe('modules/manager/cargo/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/cache/containerbase', }, }, @@ -273,7 +271,6 @@ describe('modules/manager/cargo/artifacts', () => { cwd: '/tmp/github/some/repo', encoding: 'utf-8', env: { - BUILDPACK_CACHE_DIR: '/tmp/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/cache/containerbase', }, }, @@ -283,7 +280,6 @@ describe('modules/manager/cargo/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/cache/containerbase', }, }, diff --git a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap index 78c9fda40c6bca0df8c3c566e6c17c0ead0c23b4..3e0f072131ba2bfa4dba95301c9ef52ce2e2de3b 100644 --- a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap @@ -63,12 +63,11 @@ exports[`modules/manager/cocoapods/artifacts returns updated Podfile 1`] = ` }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool ruby 3.1.0 && install-tool cocoapods 3.1.0 && gem install cocoapods-acknowledgements && pod install"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool ruby 3.1.0 && install-tool cocoapods 3.1.0 && gem install cocoapods-acknowledgements && pod install"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -94,12 +93,11 @@ exports[`modules/manager/cocoapods/artifacts returns updated Podfile and Pods fi }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool ruby 3.1.0 && install-tool cocoapods 3.1.0 && pod install"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool ruby 3.1.0 && install-tool cocoapods 3.1.0 && pod install"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", diff --git a/lib/modules/manager/cocoapods/artifacts.spec.ts b/lib/modules/manager/cocoapods/artifacts.spec.ts index 6abfc45974d42e83583739fc1fc9ff970d60cd63..80d6e085ca0647465d27d417a6beb1160cacac9d 100644 --- a/lib/modules/manager/cocoapods/artifacts.spec.ts +++ b/lib/modules/manager/cocoapods/artifacts.spec.ts @@ -259,7 +259,6 @@ describe('modules/manager/cocoapods/artifacts', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/composer/artifacts.spec.ts b/lib/modules/manager/composer/artifacts.spec.ts index 089389a9b57e5437418e286ce24f26a69b360928..779ac1bdf5dff6e93d0729f716d941a27ce8605e 100644 --- a/lib/modules/manager/composer/artifacts.spec.ts +++ b/lib/modules/manager/composer/artifacts.spec.ts @@ -17,7 +17,7 @@ jest.mock('../../datasource'); jest.mock('../../../util/fs'); jest.mock('../../../util/git'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const datasource = mocked(_datasource); @@ -802,7 +802,6 @@ describe('modules/manager/composer/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + '-e COMPOSER_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -816,7 +815,6 @@ describe('modules/manager/composer/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', COMPOSER_CACHE_DIR: '/tmp/renovate/cache/others/composer', }, }, @@ -875,7 +873,6 @@ describe('modules/manager/composer/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', COMPOSER_CACHE_DIR: '/tmp/renovate/cache/others/composer', }, }, diff --git a/lib/modules/manager/gomod/artifacts.spec.ts b/lib/modules/manager/gomod/artifacts.spec.ts index 434e850d1aa8b572a310d1bdcd03b66fcb23223b..5c8d455b6e44e09808c8da7d7d7fd7d15d1c3079 100644 --- a/lib/modules/manager/gomod/artifacts.spec.ts +++ b/lib/modules/manager/gomod/artifacts.spec.ts @@ -28,7 +28,7 @@ jest.mock('../../../util/fs', () => { }); jest.mock('../../datasource'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const datasource = mocked(_datasource); const hostRules = mocked(_hostRules); @@ -323,7 +323,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -334,9 +333,7 @@ describe('modules/manager/gomod/artifacts', () => { '"', options: { cwd: '/tmp/github/some/repo', - env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', - }, + env: {}, }, }, ]); @@ -379,9 +376,7 @@ describe('modules/manager/gomod/artifacts', () => { cmd: 'go get -d -t ./...', options: { cwd: '/tmp/github/some/repo', - env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', - }, + env: {}, }, }, ]); @@ -493,7 +488,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GIT_CONFIG_VALUE_4 ' + '-e GIT_CONFIG_KEY_5 ' + '-e GIT_CONFIG_VALUE_5 ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -505,7 +499,6 @@ describe('modules/manager/gomod/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', GIT_CONFIG_COUNT: '6', GIT_CONFIG_KEY_0: 'url.https://ssh:some-token@github.com/.insteadOf', @@ -1005,7 +998,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -1070,7 +1062,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -1135,7 +1126,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -1200,7 +1190,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -1858,7 +1847,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -1933,7 +1921,6 @@ describe('modules/manager/gomod/artifacts', () => { '-e GOINSECURE ' + '-e GOFLAGS ' + '-e CGO_ENABLED ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/gradle-wrapper/artifacts.spec.ts b/lib/modules/manager/gradle-wrapper/artifacts.spec.ts index bd9e7349f9a3fdffea15730293f8b1a28da322d3..4f4ec1028a280b1dc2cadf6168fb595888847e04 100644 --- a/lib/modules/manager/gradle-wrapper/artifacts.spec.ts +++ b/lib/modules/manager/gradle-wrapper/artifacts.spec.ts @@ -212,7 +212,6 @@ describe('modules/manager/gradle-wrapper/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GRADLE_OPTS ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/gradle/artifacts.spec.ts b/lib/modules/manager/gradle/artifacts.spec.ts index 6318b887d3d2512c118b7cebccca790675179f79..15f6f35a9c6d8f1cd7e1ca49cefef783edf09567 100644 --- a/lib/modules/manager/gradle/artifacts.spec.ts +++ b/lib/modules/manager/gradle/artifacts.spec.ts @@ -335,7 +335,6 @@ describe('modules/manager/gradle/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GRADLE_OPTS ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + @@ -353,7 +352,6 @@ describe('modules/manager/gradle/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e GRADLE_OPTS ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/helmfile/artifacts.spec.ts b/lib/modules/manager/helmfile/artifacts.spec.ts index 9cb6ec3788c62b7dd583c2a3c0c875b716c7b6ee..10eaa9fd7d9e3dd72420c62c370f16501fca7354 100644 --- a/lib/modules/manager/helmfile/artifacts.spec.ts +++ b/lib/modules/manager/helmfile/artifacts.spec.ts @@ -319,7 +319,6 @@ describe('modules/manager/helmfile/artifacts', () => { '-e HELM_REGISTRY_CONFIG ' + '-e HELM_REPOSITORY_CONFIG ' + '-e HELM_REPOSITORY_CACHE ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap index f4e5d2e08f49c69ea69fff41bc310263c4bd4696..974ad178fb26482603e7da92031737330f01f671 100644 --- a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap @@ -468,12 +468,11 @@ exports[`modules/manager/helmv3/artifacts returns updated Chart.lock with docker }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e HELM_EXPERIMENTAL_OCI -e HELM_REGISTRY_CONFIG -e HELM_REPOSITORY_CONFIG -e HELM_REPOSITORY_CACHE -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add repo-test https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update ''"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e HELM_EXPERIMENTAL_OCI -e HELM_REGISTRY_CONFIG -e HELM_REPOSITORY_CONFIG -e HELM_REPOSITORY_CACHE -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add repo-test https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update ''"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HELM_EXPERIMENTAL_OCI": "1", "HELM_REGISTRY_CONFIG": "/tmp/renovate/cache/__renovate-private-cache/registry.json", @@ -602,12 +601,11 @@ exports[`modules/manager/helmv3/artifacts sets repositories from registryAliases }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e HELM_EXPERIMENTAL_OCI -e HELM_REGISTRY_CONFIG -e HELM_REPOSITORY_CONFIG -e HELM_REPOSITORY_CACHE -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add stable the_stable_url && helm repo add repo1 the_repo1_url && helm repo add repo-test https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update ''"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e HELM_EXPERIMENTAL_OCI -e HELM_REGISTRY_CONFIG -e HELM_REPOSITORY_CONFIG -e HELM_REPOSITORY_CACHE -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add stable the_stable_url && helm repo add repo1 the_repo1_url && helm repo add repo-test https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update ''"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HELM_EXPERIMENTAL_OCI": "1", "HELM_REGISTRY_CONFIG": "/tmp/renovate/cache/__renovate-private-cache/registry.json", diff --git a/lib/modules/manager/maven-wrapper/artifacts.spec.ts b/lib/modules/manager/maven-wrapper/artifacts.spec.ts index 359919d3a1eae822efd5e70cc42749836c602d31..023249152b02503b8dac6bc5c865afd4eacb26a8 100644 --- a/lib/modules/manager/maven-wrapper/artifacts.spec.ts +++ b/lib/modules/manager/maven-wrapper/artifacts.spec.ts @@ -205,7 +205,6 @@ describe('modules/manager/maven-wrapper/artifacts', () => { cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "./":"./" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "../.." ' + 'ghcr.io/containerbase/sidecar' + diff --git a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap index 4741c076830db33095a91a837d36a3ed98f7fb76..73230923e47361a7a41921a84eb201539d981d0e 100644 --- a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap @@ -21,12 +21,11 @@ exports[`modules/manager/mix/artifacts authenticates to private repositories 2`] }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool erlang 25.0.0.0 && install-tool elixir v1.13.4 && mix hex.organization auth renovate_test --key valid_test_token && mix deps.update private_package other_package"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool erlang 25.0.0.0 && install-tool elixir v1.13.4 && mix hex.organization auth renovate_test --key valid_test_token && mix deps.update private_package other_package"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -81,12 +80,11 @@ exports[`modules/manager/mix/artifacts returns updated mix.lock 1`] = ` }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool erlang 25.0.0.0 && install-tool elixir 1.13.4 && mix deps.update plug"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/cache":"/tmp/cache" -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool erlang 25.0.0.0 && install-tool elixir 1.13.4 && mix deps.update plug"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", diff --git a/lib/modules/manager/nix/artifacts.spec.ts b/lib/modules/manager/nix/artifacts.spec.ts index 0877831a67938768160fc3b440f03b5fee04d4a3..c3fe645e9b826ef6b2684c2dede6654b807127ed 100644 --- a/lib/modules/manager/nix/artifacts.spec.ts +++ b/lib/modules/manager/nix/artifacts.spec.ts @@ -30,7 +30,7 @@ const dockerAdminConfig = { dockerSidecarImage: 'ghcr.io/containerbase/sidecar', }; -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const config: UpdateArtifactsConfig = {}; const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true }; @@ -188,7 +188,6 @@ describe('modules/manager/nix/artifacts', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -319,7 +318,6 @@ describe('modules/manager/nix/artifacts', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/npm/post-update/lerna.spec.ts b/lib/modules/manager/npm/post-update/lerna.spec.ts index 69e88d45da0f910fe4bd83e486956d82d5604489..96426a0f899ddfa2ff250c8d88780da7b00f85d7 100644 --- a/lib/modules/manager/npm/post-update/lerna.spec.ts +++ b/lib/modules/manager/npm/post-update/lerna.spec.ts @@ -10,7 +10,7 @@ jest.mock('../../../../util/exec/env'); jest.mock('./node-version'); jest.mock('../../../datasource'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; function lernaPkgFile(lernaClient: string): Partial<PackageFileContent> { return { @@ -157,7 +157,6 @@ describe('modules/manager/npm/post-update/lerna', () => { cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "some-dir" ghcr.io/containerbase/sidecar ' + 'bash -l -c "' + diff --git a/lib/modules/manager/npm/post-update/npm.spec.ts b/lib/modules/manager/npm/post-update/npm.spec.ts index ff0f453b6635bbb3c14c1396a943457de4fc08ca..833a7ad9b8c3b6c36f2e2ef50dc16e4787c6a8a8 100644 --- a/lib/modules/manager/npm/post-update/npm.spec.ts +++ b/lib/modules/manager/npm/post-update/npm.spec.ts @@ -10,7 +10,7 @@ jest.mock('../../../../util/exec/env'); jest.mock('../../../../util/fs'); jest.mock('./node-version'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; describe('modules/manager/npm/post-update/npm', () => { beforeEach(() => { @@ -266,7 +266,6 @@ describe('modules/manager/npm/post-update/npm', () => { cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp":"/tmp" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "some-dir" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/npm/post-update/pnpm.spec.ts b/lib/modules/manager/npm/post-update/pnpm.spec.ts index e3a9fe79ebec238c5a6370cb7ab4e5dc1774afb3..adf740f2808e762d951d034adc597f7810e22072 100644 --- a/lib/modules/manager/npm/post-update/pnpm.spec.ts +++ b/lib/modules/manager/npm/post-update/pnpm.spec.ts @@ -11,7 +11,7 @@ jest.mock('../../../../util/fs'); jest.mock('./node-version'); delete process.env.NPM_CONFIG_CACHE; -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; describe('modules/manager/npm/post-update/pnpm', () => { let config: PostUpdateConfig; @@ -231,7 +231,6 @@ describe('modules/manager/npm/post-update/pnpm', () => { cmd: 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp":"/tmp" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "some-dir" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/npm/post-update/yarn.spec.ts b/lib/modules/manager/npm/post-update/yarn.spec.ts index 997bd070438447627921919a71ac75da8a90e24f..fcc70d8ab23566738570d67ecd0c0f256ea62356 100644 --- a/lib/modules/manager/npm/post-update/yarn.spec.ts +++ b/lib/modules/manager/npm/post-update/yarn.spec.ts @@ -357,7 +357,7 @@ describe('modules/manager/npm/post-update/yarn', () => { }); it('supports corepack', async () => { - process.env.BUILDPACK = 'true'; + process.env.CONTAINERBASE = 'true'; GlobalConfig.set({ localDir: '.', binarySource: 'install', @@ -403,7 +403,7 @@ describe('modules/manager/npm/post-update/yarn', () => { }); it('supports corepack on grouping', async () => { - process.env.BUILDPACK = 'true'; + process.env.CONTAINERBASE = 'true'; GlobalConfig.set({ localDir: '.', binarySource: 'install', @@ -454,7 +454,7 @@ describe('modules/manager/npm/post-update/yarn', () => { it('uses slim yarn instead of corepack', async () => { // sanity check for later refactorings expect(plocktest1YarnLockV1).toBeTruthy(); - process.env.BUILDPACK = 'true'; + process.env.CONTAINERBASE = 'true'; GlobalConfig.set({ localDir: '.', binarySource: 'install', @@ -559,7 +559,7 @@ describe('modules/manager/npm/post-update/yarn', () => { { cmd: 'docker pull ghcr.io/containerbase/sidecar', options }, { cmd: - `docker run --rm --name=renovate_sidecar --label=renovate_child -v ".":"." -v "/tmp/cache":"/tmp/cache" -e CI -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "some-dir" ghcr.io/containerbase/sidecar ` + + `docker run --rm --name=renovate_sidecar --label=renovate_child -v ".":"." -v "/tmp/cache":"/tmp/cache" -e CI -e CONTAINERBASE_CACHE_DIR -w "some-dir" ghcr.io/containerbase/sidecar ` + `bash -l -c "` + `install-tool node 16.16.0` + ` && ` + diff --git a/lib/modules/manager/nuget/artifacts.spec.ts b/lib/modules/manager/nuget/artifacts.spec.ts index d950b750df16d90d451028f54b000cff3003fd2b..9d72b820fcab63f00b4e2e9371cd26967b82c373 100644 --- a/lib/modules/manager/nuget/artifacts.spec.ts +++ b/lib/modules/manager/nuget/artifacts.spec.ts @@ -265,7 +265,6 @@ describe('modules/manager/nuget/artifacts', () => { '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + '-e NUGET_PACKAGES ' + '-e MSBUILDDISABLENODEREUSE ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -276,7 +275,6 @@ describe('modules/manager/nuget/artifacts', () => { '"', options: { env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/renovate/cache/containerbase', NUGET_PACKAGES: '/tmp/renovate/cache/__renovate-private-cache/nuget/packages', @@ -319,7 +317,6 @@ describe('modules/manager/nuget/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/renovate/cache/containerbase', NUGET_PACKAGES: '/tmp/renovate/cache/__renovate-private-cache/nuget/packages', @@ -332,7 +329,6 @@ describe('modules/manager/nuget/artifacts', () => { options: { cwd: '/tmp/github/some/repo', env: { - BUILDPACK_CACHE_DIR: '/tmp/renovate/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/renovate/cache/containerbase', NUGET_PACKAGES: '/tmp/renovate/cache/__renovate-private-cache/nuget/packages', diff --git a/lib/modules/manager/pep621/artifacts.spec.ts b/lib/modules/manager/pep621/artifacts.spec.ts index 717a03899c64ea72ce52eb15dabea32e5dc017fd..a5b8fcd55a028b6915bbc77dc9cb0488450dc58d 100644 --- a/lib/modules/manager/pep621/artifacts.spec.ts +++ b/lib/modules/manager/pep621/artifacts.spec.ts @@ -118,7 +118,6 @@ requires-python = "<3.9" 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -133,7 +132,6 @@ requires-python = "<3.9" cwd: '/tmp/github/some/repo', encoding: 'utf-8', env: { - BUILDPACK_CACHE_DIR: '/tmp/cache/containerbase', CONTAINERBASE_CACHE_DIR: '/tmp/cache/containerbase', }, }, diff --git a/lib/modules/manager/pep621/processors/pdm.spec.ts b/lib/modules/manager/pep621/processors/pdm.spec.ts index 54d028b26b72f9eb3c89e0729831ec5333fe6329..92b7127c3a96404d6360c977001631adc6db8c2d 100644 --- a/lib/modules/manager/pep621/processors/pdm.spec.ts +++ b/lib/modules/manager/pep621/processors/pdm.spec.ts @@ -81,7 +81,6 @@ describe('modules/manager/pep621/processors/pdm', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/pip-compile/artifacts.spec.ts b/lib/modules/manager/pip-compile/artifacts.spec.ts index e9ac229bece2deec5abc910c2a2b580f94606bd1..a9fc034e8425f2aabdb5471d67321c70b6ffd194 100644 --- a/lib/modules/manager/pip-compile/artifacts.spec.ts +++ b/lib/modules/manager/pip-compile/artifacts.spec.ts @@ -33,7 +33,7 @@ const dockerAdminConfig = { dockerSidecarImage: 'ghcr.io/containerbase/sidecar', }; -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const config: UpdateArtifactsConfig = {}; const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true }; @@ -134,7 +134,6 @@ describe('modules/manager/pip-compile/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + '-e PIP_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -259,7 +258,6 @@ describe('modules/manager/pip-compile/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + '-e PIP_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/pip_requirements/artifacts.spec.ts b/lib/modules/manager/pip_requirements/artifacts.spec.ts index e8fbbf585cea1d88e51922be93d6a41339ffd43f..78ed52537de46788d42e94b3c6bc5142985fea1e 100644 --- a/lib/modules/manager/pip_requirements/artifacts.spec.ts +++ b/lib/modules/manager/pip_requirements/artifacts.spec.ts @@ -13,7 +13,7 @@ jest.mock('../../../util/exec/common'); jest.mock('../../../util/fs'); jest.mock('../../datasource'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const adminConfig: RepoGlobalConfig = { // `join` fixes Windows CI @@ -226,7 +226,6 @@ describe('modules/manager/pip_requirements/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/renovate/cache":"/tmp/renovate/cache" ' + '-e PIP_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap index a66e1c1d655ce612ffc17e7ecc5cf1cd529e6da3..d08dc91b55db394cc70034427e98ec0803700621 100644 --- a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap +++ b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap @@ -111,12 +111,11 @@ exports[`modules/manager/pipenv/artifacts supports docker mode 1`] = ` }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e PIP_CACHE_DIR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.7.6 && install-tool pipenv 2023.1.2 && pipenv lock"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e PIP_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.7.6 && install-tool pipenv 2023.1.2 && pipenv lock"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -150,12 +149,11 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile 1`] = }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.8.13 && pipenv lock"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.8.13 && pipenv lock"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -188,12 +186,11 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile dev p }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.8.13 && pipenv lock"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.8.13 && pipenv lock"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", @@ -226,12 +223,11 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from config 1`] = }, }, { - "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.1.1 && pipenv lock"", + "cmd": "docker run --rm --name=renovate_sidecar --label=renovate_child -v "/tmp/github/some/repo":"/tmp/github/some/repo" -v "/tmp/renovate/cache":"/tmp/renovate/cache" -e PIPENV_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" ghcr.io/containerbase/sidecar bash -l -c "install-tool python 3.10.2 && install-tool pipenv 2020.1.1 && pipenv lock"", "options": { "cwd": "/tmp/github/some/repo", "encoding": "utf-8", "env": { - "BUILDPACK_CACHE_DIR": "/tmp/renovate/cache/containerbase", "CONTAINERBASE_CACHE_DIR": "/tmp/renovate/cache/containerbase", "HOME": "/home/user", "HTTPS_PROXY": "https://example.com", diff --git a/lib/modules/manager/pipenv/artifacts.spec.ts b/lib/modules/manager/pipenv/artifacts.spec.ts index 40f2a7c43a5df643f8eb79e0299aca261afcb023..0cea65686f7720c3ca74cec159f15a0441ee1038 100644 --- a/lib/modules/manager/pipenv/artifacts.spec.ts +++ b/lib/modules/manager/pipenv/artifacts.spec.ts @@ -26,7 +26,7 @@ jest.mock('../../../util/host-rules'); jest.mock('../../../util/http'); jest.mock('../../datasource'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const getPkgReleases = mockedFunction(_getPkgReleases); diff --git a/lib/modules/manager/poetry/artifacts.spec.ts b/lib/modules/manager/poetry/artifacts.spec.ts index d09a0908d7a55209aad72374504ec3599751ad7a..72d2f8023a15e64d5385d3a4858a0885edf66a42 100644 --- a/lib/modules/manager/poetry/artifacts.spec.ts +++ b/lib/modules/manager/poetry/artifacts.spec.ts @@ -19,7 +19,7 @@ jest.mock('../../../util/fs'); jest.mock('../../datasource'); jest.mock('../../../util/host-rules'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const datasource = mocked(_datasource); const hostRules = mocked(_hostRules); @@ -300,7 +300,6 @@ describe('modules/manager/poetry/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e PIP_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + @@ -367,7 +366,6 @@ describe('modules/manager/poetry/artifacts', () => { '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + '-e PIP_CACHE_DIR ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/modules/manager/pub/artifacts.spec.ts b/lib/modules/manager/pub/artifacts.spec.ts index f051bb8665e04986788492f19bbb080f9a87cfbf..2ae1fb8bb7803fa5f6c27c131a312c2d8c9870fa 100644 --- a/lib/modules/manager/pub/artifacts.spec.ts +++ b/lib/modules/manager/pub/artifacts.spec.ts @@ -14,7 +14,7 @@ jest.mock('../../../util/git'); jest.mock('../../../util/http'); jest.mock('../../datasource'); -process.env.BUILDPACK = 'true'; +process.env.CONTAINERBASE = 'true'; const lockFile = 'pubspec.lock'; const oldLockFileContent = 'Old pubspec.lock'; @@ -176,7 +176,6 @@ describe('modules/manager/pub/artifacts', () => { 'docker run --rm --name=renovate_sidecar --label=renovate_child ' + '-v "/tmp/github/some/repo":"/tmp/github/some/repo" ' + '-v "/tmp/cache":"/tmp/cache" ' + - '-e BUILDPACK_CACHE_DIR ' + '-e CONTAINERBASE_CACHE_DIR ' + '-w "/tmp/github/some/repo" ' + 'ghcr.io/containerbase/sidecar ' + diff --git a/lib/util/exec/containerbase.spec.ts b/lib/util/exec/containerbase.spec.ts index c6b184fd0cd12f9888818d40f058e823cd6297e4..5d5c5c2f8d8a3d27ec8dd16d3de115aa4803850e 100644 --- a/lib/util/exec/containerbase.spec.ts +++ b/lib/util/exec/containerbase.spec.ts @@ -16,7 +16,6 @@ describe('util/exec/containerbase', () => { describe('isDynamicInstall()', () => { beforeEach(() => { GlobalConfig.reset(); - delete process.env.BUILDPACK; delete process.env.CONTAINERBASE; }); diff --git a/lib/util/exec/containerbase.ts b/lib/util/exec/containerbase.ts index fb28722b097ebbe66e0b90e9294552985f951ad6..6571d1850b8b98df05caa7ac21cd136b2e798c32 100644 --- a/lib/util/exec/containerbase.ts +++ b/lib/util/exec/containerbase.ts @@ -202,7 +202,7 @@ export function supportsDynamicInstall(toolName: string): boolean { } export function isContainerbase(): boolean { - return !!process.env.CONTAINERBASE || !!process.env.BUILDPACK; + return !!process.env.CONTAINERBASE; } export function isDynamicInstall( diff --git a/lib/util/exec/index.spec.ts b/lib/util/exec/index.spec.ts index d1f3444e396acbac2a7d01de591ba10a63f8aa52..f545e080727ba329bd7bef30d851b254ea318505 100644 --- a/lib/util/exec/index.spec.ts +++ b/lib/util/exec/index.spec.ts @@ -81,12 +81,10 @@ describe('util/exec/index', () => { const containerbaseEnv = { ...envMock.basic, - BUILDPACK_CACHE_DIR: `${cacheDir}containerbase`, CONTAINERBASE_CACHE_DIR: `${cacheDir}containerbase`, }; const containerbaseEnvFiltered = { ...envMock.filtered, - BUILDPACK_CACHE_DIR: `${cacheDir}containerbase`, CONTAINERBASE_CACHE_DIR: `${cacheDir}containerbase`, }; @@ -229,7 +227,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -291,7 +289,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e SELECTED_ENV_VAR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e SELECTED_ENV_VAR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -341,7 +339,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e SELECTED_ENV_VAR -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e SELECTED_ENV_VAR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -367,7 +365,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -v "${volume_1}":"${volume_1}" -v "${volume_2_from}":"${volume_2_to}" -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -v "${volume_1}":"${volume_1}" -v "${volume_2_from}":"${volume_2_to}" -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -393,7 +391,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child --user=foobar ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child --user=foobar ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -422,7 +420,7 @@ describe('util/exec/index', () => { outCmd: [ `docker pull ghcr.io/containerbase/${image}`, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ghcr.io/containerbase/${image} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ghcr.io/containerbase/${image} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -451,7 +449,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, `docker ps --filter name=myprefix_${image} -aq`, - `docker run --rm --name=myprefix_${image} --label=myprefix_child ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=myprefix_${image} --label=myprefix_child ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -483,7 +481,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "preCommand1 && preCommand2 && ${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "preCommand1 && preCommand2 && ${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -509,7 +507,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CONTAINERBASE_CACHE_DIR -w "${cwd}" ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -655,7 +653,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CUSTOM_KEY -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CUSTOM_KEY -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -689,7 +687,7 @@ describe('util/exec/index', () => { outCmd: [ dockerPullCmd, dockerRemoveCmd, - `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CUSTOM_KEY -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, + `docker run --rm --name=${name} --label=renovate_child ${defaultVolumes} -e CUSTOM_KEY -e CONTAINERBASE_CACHE_DIR ${defaultCwd} ${fullImage} bash -l -c "${inCmd}"`, ], outOpts: [ dockerPullOpts, @@ -840,15 +838,15 @@ describe('util/exec/index', () => { `echo hello`, `docker pull ${fullImage}`, `docker ps --filter name=renovate_${image} -aq`, - `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, + `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, `docker ps --filter name=renovate_${image} -aq`, - `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, + `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, `echo hello`, `echo hello`, `docker ps --filter name=renovate_${image} -aq`, - `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, + `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, `docker ps --filter name=renovate_${image} -aq`, - `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, + `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`, ]); }); diff --git a/lib/util/exec/index.ts b/lib/util/exec/index.ts index 547ad0f2be1c385a12bedea769eda0f21fca3da2..f0b01f345c33316d8f53718e5b91fad80dedc642 100644 --- a/lib/util/exec/index.ts +++ b/lib/util/exec/index.ts @@ -116,7 +116,6 @@ async function prepareRawExec( if (binarySource === 'docker' || binarySource === 'install') { logger.debug(`Setting CONTAINERBASE_CACHE_DIR to ${containerbaseDir!}`); opts.env ??= {}; - opts.env.BUILDPACK_CACHE_DIR = containerbaseDir; opts.env.CONTAINERBASE_CACHE_DIR = containerbaseDir; } @@ -133,7 +132,6 @@ async function prepareRawExec( const childEnv = getChildEnv(opts); const envVars = [ ...dockerEnvVars(extraEnv, childEnv), - 'BUILDPACK_CACHE_DIR', 'CONTAINERBASE_CACHE_DIR', ]; const cwd = getCwd(opts);