From aa14b777c0b6755d77ff9a5e6c27ae1e328b14e5 Mon Sep 17 00:00:00 2001
From: RahulGautamSingh <rahultesnik@gmail.com>
Date: Sat, 17 Jun 2023 13:04:05 +0545
Subject: [PATCH] feat!: replace `dockerImagePrefix` with `dockerSidecarImage`
(#22708)
Closes #21217
BREAKING CHANGE: dockerImagePrefix is now replaced by dockerSidecarImage
---
docs/usage/self-hosted-configuration.md | 10 +++---
lib/config/global.ts | 2 +-
lib/config/options/index.ts | 6 ++--
lib/config/types.ts | 2 +-
lib/modules/manager/bundler/artifacts.spec.ts | 29 +++++++--------
lib/modules/manager/cargo/artifacts.spec.ts | 5 +--
.../__snapshots__/artifacts.spec.ts.snap | 8 ++---
.../manager/cocoapods/artifacts.spec.ts | 5 +--
.../manager/composer/artifacts.spec.ts | 5 +--
lib/modules/manager/gomod/artifacts.spec.ts | 35 ++++++++++---------
.../manager/gradle-wrapper/artifacts.spec.ts | 10 ++++--
lib/modules/manager/gradle/artifacts.spec.ts | 7 ++--
.../manager/helmfile/artifacts.spec.ts | 5 +--
.../__snapshots__/artifacts.spec.ts.snap | 8 ++---
lib/modules/manager/helmv3/artifacts.spec.ts | 12 +++++--
.../manager/maven-wrapper/artifacts.spec.ts | 10 ++++--
.../mix/__snapshots__/artifacts.spec.ts.snap | 6 ++--
lib/modules/manager/mix/artifacts.spec.ts | 18 ++++++++--
lib/modules/manager/nix/artifacts.spec.ts | 14 +++++---
.../manager/npm/post-update/lerna.spec.ts | 10 ++++--
.../manager/npm/post-update/npm.spec.ts | 5 +--
.../manager/npm/post-update/pnpm.spec.ts | 5 +--
.../manager/npm/post-update/yarn.spec.ts | 5 +--
lib/modules/manager/nuget/artifacts.spec.ts | 10 ++++--
lib/modules/manager/pep621/artifacts.spec.ts | 10 ++++--
.../manager/pep621/processors/pdm.spec.ts | 10 ++++--
.../manager/pip-compile/artifacts.spec.ts | 14 +++++---
.../pip_requirements/artifacts.spec.ts | 10 ++++--
.../__snapshots__/artifacts.spec.ts.snap | 16 ++++-----
lib/modules/manager/pipenv/artifacts.spec.ts | 6 +++-
lib/modules/manager/poetry/artifacts.spec.ts | 20 +++++++----
lib/modules/manager/pub/artifacts.spec.ts | 10 ++++--
lib/util/exec/docker/index.spec.ts | 9 +++--
lib/util/exec/docker/index.ts | 8 ++---
lib/util/exec/index.spec.ts | 10 ++++--
renovate.json | 9 +++++
36 files changed, 231 insertions(+), 133 deletions(-)
diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
index d133a5eb34..7a8f9913f0 100644
--- a/docs/usage/self-hosted-configuration.md
+++ b/docs/usage/self-hosted-configuration.md
@@ -312,17 +312,17 @@ For example, `{"dockerCliOptions": "--memory=4g"}` will add a CLI flag to the `d
Read the [Docker Docs, configure runtime resource contraints](https://docs.docker.com/config/containers/resource_constraints/) to learn more.
-## dockerImagePrefix
+## dockerSidecarImage
-By default Renovate pulls the sidecar Docker containers from `docker.io/containerbase`.
-You can use the `dockerImagePrefix` option to override this default.
+By default Renovate pulls the sidecar Docker containers from `ghcr.io/containerbase/sidecar`.
+You can use the `dockerSidecarImage` option to override this default.
-Say you want to pull your images from `ghcr.io/containerbase` to bypass Docker Hub limits.
+Say you want to pull a custom image from `ghcr.io/your_company/sidecar`.
You would put this in your configuration file:
```json
{
- "dockerImagePrefix": "ghcr.io/containerbase"
+ "dockerSidecarImage": "ghcr.io/your_company/sidecar"
}
```
diff --git a/lib/config/global.ts b/lib/config/global.ts
index fca0001909..7c6149d2a6 100644
--- a/lib/config/global.ts
+++ b/lib/config/global.ts
@@ -15,7 +15,7 @@ export class GlobalConfig {
'customEnvVariables',
'dockerChildPrefix',
'dockerCliOptions',
- 'dockerImagePrefix',
+ 'dockerSidecarImage',
'dockerUser',
'dryRun',
'exposeAllEnv',
diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
index 532404cbbd..f2a027fa18 100644
--- a/lib/config/options/index.ts
+++ b/lib/config/options/index.ts
@@ -351,11 +351,11 @@ const options: RenovateOptions[] = [
globalOnly: true,
},
{
- name: 'dockerImagePrefix',
+ name: 'dockerSidecarImage',
description:
- 'Change this value to override the default Renovate Docker sidecar image name prefix.',
+ 'Change this value to override the default Renovate sidecar image.',
type: 'string',
- default: 'docker.io/containerbase',
+ default: 'ghcr.io/containerbase/sidecar:8.0.2',
globalOnly: true,
},
{
diff --git a/lib/config/types.ts b/lib/config/types.ts
index 9758ce5fe7..6136e57639 100644
--- a/lib/config/types.ts
+++ b/lib/config/types.ts
@@ -128,7 +128,7 @@ export interface RepoGlobalConfig {
customEnvVariables?: Record<string, string>;
dockerChildPrefix?: string;
dockerCliOptions?: string;
- dockerImagePrefix?: string;
+ dockerSidecarImage?: string;
dockerUser?: string;
dryRun?: DryRunConfig;
executionTimeout?: number;
diff --git a/lib/modules/manager/bundler/artifacts.spec.ts b/lib/modules/manager/bundler/artifacts.spec.ts
index 841f8ecc89..d131b7d5d3 100644
--- a/lib/modules/manager/bundler/artifacts.spec.ts
+++ b/lib/modules/manager/bundler/artifacts.spec.ts
@@ -37,6 +37,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/cache'),
containerbaseDir: join('/tmp/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
const config: UpdateArtifactsConfig = {};
@@ -279,7 +280,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -290,7 +291,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -339,7 +340,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -350,7 +351,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.5' +
' && ' +
@@ -401,7 +402,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -412,7 +413,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.3.0' +
' && ' +
@@ -462,7 +463,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -474,7 +475,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -533,7 +534,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -544,7 +545,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -605,7 +606,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -616,7 +617,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -676,7 +677,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -687,7 +688,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
diff --git a/lib/modules/manager/cargo/artifacts.spec.ts b/lib/modules/manager/cargo/artifacts.spec.ts
index 1ad6453f3c..99b32f0f35 100644
--- a/lib/modules/manager/cargo/artifacts.spec.ts
+++ b/lib/modules/manager/cargo/artifacts.spec.ts
@@ -21,6 +21,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/cache'),
containerbaseDir: join('/tmp/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
describe('modules/manager/cargo/artifacts', () => {
@@ -210,7 +211,7 @@ describe('modules/manager/cargo/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
cmd:
@@ -220,7 +221,7 @@ describe('modules/manager/cargo/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool rust 1.65.0' +
' && ' +
diff --git a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
index 3dab15063a..78c9fda40c 100644
--- a/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
@@ -57,13 +57,13 @@ exports[`modules/manager/cocoapods/artifacts returns pod exec error 1`] = `
exports[`modules/manager/cocoapods/artifacts returns updated Podfile 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
},
{
- "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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -88,13 +88,13 @@ exports[`modules/manager/cocoapods/artifacts returns updated Podfile 1`] = `
exports[`modules/manager/cocoapods/artifacts returns updated Podfile and Pods files 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
},
{
- "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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/cocoapods/artifacts.spec.ts b/lib/modules/manager/cocoapods/artifacts.spec.ts
index a4caf0fe10..6abfc45974 100644
--- a/lib/modules/manager/cocoapods/artifacts.spec.ts
+++ b/lib/modules/manager/cocoapods/artifacts.spec.ts
@@ -26,6 +26,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/cache'),
containerbaseDir: join('/tmp/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
describe('modules/manager/cocoapods/artifacts', () => {
@@ -252,7 +253,7 @@ describe('modules/manager/cocoapods/artifacts', () => {
config,
});
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{
cmd:
'docker run --rm --name=renovate_sidecar --label=renovate_child ' +
@@ -261,7 +262,7 @@ describe('modules/manager/cocoapods/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 3.1.0' +
' && ' +
diff --git a/lib/modules/manager/composer/artifacts.spec.ts b/lib/modules/manager/composer/artifacts.spec.ts
index bd197b7233..089389a9b5 100644
--- a/lib/modules/manager/composer/artifacts.spec.ts
+++ b/lib/modules/manager/composer/artifacts.spec.ts
@@ -33,6 +33,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
const repoStatus = partial<StatusResult>({
@@ -784,7 +785,7 @@ describe('modules/manager/composer/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
options: {
encoding: 'utf-8',
},
@@ -804,7 +805,7 @@ describe('modules/manager/composer/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool php 7.3' +
' && ' +
diff --git a/lib/modules/manager/gomod/artifacts.spec.ts b/lib/modules/manager/gomod/artifacts.spec.ts
index aee0645b62..434e850d1a 100644
--- a/lib/modules/manager/gomod/artifacts.spec.ts
+++ b/lib/modules/manager/gomod/artifacts.spec.ts
@@ -59,6 +59,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
const config: UpdateArtifactsConfig = {
@@ -308,7 +309,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -325,7 +326,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -465,7 +466,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -495,7 +496,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -576,7 +577,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
options: {
@@ -990,7 +991,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
cmd:
@@ -1007,7 +1008,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1055,7 +1056,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
cmd:
@@ -1072,7 +1073,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1120,7 +1121,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
cmd:
@@ -1137,7 +1138,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1185,7 +1186,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{},
{
cmd:
@@ -1202,7 +1203,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1842,7 +1843,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{},
{
@@ -1860,7 +1861,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.17.0' +
' && ' +
@@ -1917,7 +1918,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{},
{
@@ -1935,7 +1936,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
diff --git a/lib/modules/manager/gradle-wrapper/artifacts.spec.ts b/lib/modules/manager/gradle-wrapper/artifacts.spec.ts
index 91da449037..bd9e7349f9 100644
--- a/lib/modules/manager/gradle-wrapper/artifacts.spec.ts
+++ b/lib/modules/manager/gradle-wrapper/artifacts.spec.ts
@@ -181,7 +181,11 @@ describe('modules/manager/gradle-wrapper/artifacts', () => {
modified: ['gradle/wrapper/gradle-wrapper.properties'],
})
);
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const result = await updateArtifacts({
packageFileName: 'gradle/wrapper/gradle-wrapper.properties',
@@ -200,7 +204,7 @@ describe('modules/manager/gradle-wrapper/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -211,7 +215,7 @@ describe('modules/manager/gradle-wrapper/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 11.0.1' +
' && ' +
diff --git a/lib/modules/manager/gradle/artifacts.spec.ts b/lib/modules/manager/gradle/artifacts.spec.ts
index f52fcf0d27..6318b887d3 100644
--- a/lib/modules/manager/gradle/artifacts.spec.ts
+++ b/lib/modules/manager/gradle/artifacts.spec.ts
@@ -35,6 +35,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'),
cacheDir: join('/tmp/cache'),
containerbaseDir: join('/tmp/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
const osPlatformSpy = jest.spyOn(os, 'platform');
@@ -326,7 +327,7 @@ describe('modules/manager/gradle/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -337,7 +338,7 @@ describe('modules/manager/gradle/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
@@ -355,7 +356,7 @@ describe('modules/manager/gradle/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
diff --git a/lib/modules/manager/helmfile/artifacts.spec.ts b/lib/modules/manager/helmfile/artifacts.spec.ts
index d36b45bda5..9cb6ec3788 100644
--- a/lib/modules/manager/helmfile/artifacts.spec.ts
+++ b/lib/modules/manager/helmfile/artifacts.spec.ts
@@ -24,6 +24,7 @@ const adminConfig: RepoGlobalConfig = {
localDir: join('/tmp/github/some/repo'), // `join` fixes Windows CI
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
};
const config: UpdateArtifactsConfig = {};
@@ -307,7 +308,7 @@ describe('modules/manager/helmfile/artifacts', () => {
{
binarySource: 'docker',
expectedCommands: [
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -321,7 +322,7 @@ describe('modules/manager/helmfile/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool helm v3.7.2' +
' && ' +
diff --git a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
index e3580be7b9..f4e5d2e08f 100644
--- a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
@@ -456,7 +456,7 @@ exports[`modules/manager/helmv3/artifacts returns updated Chart.lock for lockfil
exports[`modules/manager/helmv3/artifacts returns updated Chart.lock with docker 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -468,7 +468,7 @@ 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" 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 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 ''"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -590,7 +590,7 @@ exports[`modules/manager/helmv3/artifacts sets repositories from registryAliases
exports[`modules/manager/helmv3/artifacts sets repositories from registryAliases with docker 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -602,7 +602,7 @@ 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" 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 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 ''"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/helmv3/artifacts.spec.ts b/lib/modules/manager/helmv3/artifacts.spec.ts
index 0116d6b7c6..ff8e5b3ee9 100644
--- a/lib/modules/manager/helmv3/artifacts.spec.ts
+++ b/lib/modules/manager/helmv3/artifacts.spec.ts
@@ -153,7 +153,11 @@ describe('modules/manager/helmv3/artifacts', () => {
});
it('returns updated Chart.lock with docker', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.getSiblingFileName.mockReturnValueOnce('Chart.lock');
fs.readLocalFile.mockResolvedValueOnce(ociLockFile1 as never);
const execSnapshots = mockExecAll();
@@ -585,7 +589,11 @@ describe('modules/manager/helmv3/artifacts', () => {
});
it('sets repositories from registryAliases with docker', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.getSiblingFileName.mockReturnValueOnce('Chart.lock');
fs.readLocalFile.mockResolvedValueOnce(ociLockFile1 as never);
const execSnapshots = mockExecAll();
diff --git a/lib/modules/manager/maven-wrapper/artifacts.spec.ts b/lib/modules/manager/maven-wrapper/artifacts.spec.ts
index a4a8c91a2f..359919d3a1 100644
--- a/lib/modules/manager/maven-wrapper/artifacts.spec.ts
+++ b/lib/modules/manager/maven-wrapper/artifacts.spec.ts
@@ -174,7 +174,11 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
it('updates with docker', async () => {
mockMavenFileChangedInGit();
- GlobalConfig.set({ localDir: './', binarySource: 'docker' });
+ GlobalConfig.set({
+ localDir: './',
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const execSnapshots = mockExecAll({ stdout: '', stderr: '' });
const result = await updateArtifacts({
packageFileName: 'maven',
@@ -193,7 +197,7 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
options: { encoding: 'utf-8' },
},
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
@@ -204,7 +208,7 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "../.." ' +
- 'containerbase/sidecar' +
+ 'ghcr.io/containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 17.0.0 ' +
'&& ' +
diff --git a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap
index 903275a122..4741c07683 100644
--- a/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/modules/manager/mix/__snapshots__/artifacts.spec.ts.snap
@@ -21,7 +21,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -69,7 +69,7 @@ exports[`modules/manager/mix/artifacts returns null if unchanged 1`] = `
exports[`modules/manager/mix/artifacts returns updated mix.lock 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -81,7 +81,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/mix/artifacts.spec.ts b/lib/modules/manager/mix/artifacts.spec.ts
index 29801cb937..63a5576810 100644
--- a/lib/modules/manager/mix/artifacts.spec.ts
+++ b/lib/modules/manager/mix/artifacts.spec.ts
@@ -90,7 +90,11 @@ describe('modules/manager/mix/artifacts', () => {
it('returns updated mix.lock', async () => {
jest.spyOn(docker, 'removeDanglingContainers').mockResolvedValueOnce();
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.readLocalFile.mockResolvedValueOnce('Old mix.lock');
fs.findLocalSiblingOrParent.mockResolvedValueOnce('mix.lock');
const execSnapshots = mockExecAll();
@@ -161,7 +165,11 @@ describe('modules/manager/mix/artifacts', () => {
it('authenticates to private repositories', async () => {
jest.spyOn(docker, 'removeDanglingContainers').mockResolvedValueOnce();
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.readLocalFile.mockResolvedValueOnce('Old mix.lock');
fs.findLocalSiblingOrParent.mockResolvedValueOnce('mix.lock');
const execSnapshots = mockExecAll();
@@ -221,7 +229,11 @@ describe('modules/manager/mix/artifacts', () => {
});
it('returns updated mix.lock in subdir', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.findLocalSiblingOrParent.mockResolvedValueOnce('subdir/mix.lock');
mockExecAll();
expect(
diff --git a/lib/modules/manager/nix/artifacts.spec.ts b/lib/modules/manager/nix/artifacts.spec.ts
index 3550927049..0877831a67 100644
--- a/lib/modules/manager/nix/artifacts.spec.ts
+++ b/lib/modules/manager/nix/artifacts.spec.ts
@@ -24,7 +24,11 @@ const adminConfig: RepoGlobalConfig = {
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
};
-const dockerAdminConfig = { ...adminConfig, binarySource: 'docker' };
+const dockerAdminConfig = {
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+};
process.env.BUILDPACK = 'true';
@@ -177,7 +181,7 @@ describe('modules/manager/nix/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -187,7 +191,7 @@ describe('modules/manager/nix/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool nix 2.10.0 ' +
'&& ' +
@@ -308,7 +312,7 @@ describe('modules/manager/nix/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -318,7 +322,7 @@ describe('modules/manager/nix/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool nix 2.10.0 ' +
'&& ' +
diff --git a/lib/modules/manager/npm/post-update/lerna.spec.ts b/lib/modules/manager/npm/post-update/lerna.spec.ts
index 3ecb66e879..69e88d45da 100644
--- a/lib/modules/manager/npm/post-update/lerna.spec.ts
+++ b/lib/modules/manager/npm/post-update/lerna.spec.ts
@@ -134,7 +134,11 @@ describe('modules/manager/npm/post-update/lerna', () => {
it('suppports docker', async () => {
const execSnapshots = mockExecAll();
- GlobalConfig.set({ ...globalConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...globalConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const res = await lernaHelper.generateLockFiles(
lernaPkgFile('npm'),
@@ -144,7 +148,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -155,7 +159,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
'-v "/tmp/cache":"/tmp/cache" ' +
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
- '-w "some-dir" containerbase/sidecar ' +
+ '-w "some-dir" ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool node 16.16.0 ' +
'&& ' +
diff --git a/lib/modules/manager/npm/post-update/npm.spec.ts b/lib/modules/manager/npm/post-update/npm.spec.ts
index 42d4851b97..ff0f453b66 100644
--- a/lib/modules/manager/npm/post-update/npm.spec.ts
+++ b/lib/modules/manager/npm/post-update/npm.spec.ts
@@ -246,6 +246,7 @@ describe('modules/manager/npm/post-update/npm', () => {
cacheDir: '/tmp',
binarySource: 'docker',
allowScripts: true,
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
});
const execSnapshots = mockExecAll();
fs.readLocalFile.mockResolvedValue('package-lock-contents');
@@ -259,7 +260,7 @@ describe('modules/manager/npm/post-update/npm', () => {
expect(fs.readLocalFile).toHaveBeenCalledTimes(1);
expect(res.lockFile).toBe('package-lock-contents');
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -268,7 +269,7 @@ describe('modules/manager/npm/post-update/npm', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "some-dir" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool node 16.16.0 ' +
'&& ' +
diff --git a/lib/modules/manager/npm/post-update/pnpm.spec.ts b/lib/modules/manager/npm/post-update/pnpm.spec.ts
index 5acd7a58a4..e3a9fe79eb 100644
--- a/lib/modules/manager/npm/post-update/pnpm.spec.ts
+++ b/lib/modules/manager/npm/post-update/pnpm.spec.ts
@@ -213,6 +213,7 @@ describe('modules/manager/npm/post-update/pnpm', () => {
cacheDir: '/tmp',
binarySource: 'docker',
allowScripts: true,
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
});
const execSnapshots = mockExecAll();
fs.readLocalFile.mockResolvedValue('package-lock-contents');
@@ -224,7 +225,7 @@ describe('modules/manager/npm/post-update/pnpm', () => {
expect(fs.readLocalFile).toHaveBeenCalledTimes(1);
expect(res.lockFile).toBe('package-lock-contents');
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -233,7 +234,7 @@ describe('modules/manager/npm/post-update/pnpm', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "some-dir" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool node 16.16.0 ' +
'&& install-tool pnpm 6.0.0 ' +
diff --git a/lib/modules/manager/npm/post-update/yarn.spec.ts b/lib/modules/manager/npm/post-update/yarn.spec.ts
index 3a52566194..997bd07043 100644
--- a/lib/modules/manager/npm/post-update/yarn.spec.ts
+++ b/lib/modules/manager/npm/post-update/yarn.spec.ts
@@ -536,6 +536,7 @@ describe('modules/manager/npm/post-update/yarn', () => {
localDir: '.',
binarySource: 'docker',
cacheDir: '/tmp/cache',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
});
Fixtures.mock(
{
@@ -555,10 +556,10 @@ describe('modules/manager/npm/post-update/yarn', () => {
expect(res.lockFile).toBe(plocktest1YarnLockV1);
const options = { encoding: 'utf-8' };
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar', options },
+ { 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" containerbase/sidecar ` +
+ `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 ` +
`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 5520b23a89..d950b750df 100644
--- a/lib/modules/manager/nuget/artifacts.spec.ts
+++ b/lib/modules/manager/nuget/artifacts.spec.ts
@@ -222,7 +222,11 @@ describe('modules/manager/nuget/artifacts', () => {
});
it('supports docker mode', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const execSnapshots = mockExecAll();
fs.getSiblingFileName.mockReturnValueOnce('packages.lock.json');
git.getFiles.mockResolvedValueOnce({
@@ -249,7 +253,7 @@ describe('modules/manager/nuget/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -264,7 +268,7 @@ describe('modules/manager/nuget/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool dotnet 7.0.100' +
' && ' +
diff --git a/lib/modules/manager/pep621/artifacts.spec.ts b/lib/modules/manager/pep621/artifacts.spec.ts
index d28645cf79..717a03899c 100644
--- a/lib/modules/manager/pep621/artifacts.spec.ts
+++ b/lib/modules/manager/pep621/artifacts.spec.ts
@@ -58,7 +58,11 @@ describe('modules/manager/pep621/artifacts', () => {
it('return processor result', async () => {
const execSnapshots = mockExecAll();
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
fs.readLocalFile.mockResolvedValueOnce('old test content');
fs.readLocalFile.mockResolvedValueOnce('new test content');
@@ -98,7 +102,7 @@ requires-python = "<3.9"
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
options: {
encoding: 'utf-8',
},
@@ -117,7 +121,7 @@ requires-python = "<3.9"
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.8.1 ' +
'&& ' +
diff --git a/lib/modules/manager/pep621/processors/pdm.spec.ts b/lib/modules/manager/pep621/processors/pdm.spec.ts
index 4e1c77a1f4..54d028b26b 100644
--- a/lib/modules/manager/pep621/processors/pdm.spec.ts
+++ b/lib/modules/manager/pep621/processors/pdm.spec.ts
@@ -41,7 +41,11 @@ describe('modules/manager/pep621/processors/pdm', () => {
it('return null if the lock file is unchanged', async () => {
const execSnapshots = mockExecAll();
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.getSiblingFileName.mockReturnValueOnce('pdm.lock');
fs.readLocalFile.mockResolvedValueOnce('test content');
fs.readLocalFile.mockResolvedValueOnce('test content');
@@ -67,7 +71,7 @@ describe('modules/manager/pep621/processors/pdm', () => {
expect(result).toBeNull();
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -80,7 +84,7 @@ describe('modules/manager/pep621/processors/pdm', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.11.2 ' +
'&& ' +
diff --git a/lib/modules/manager/pip-compile/artifacts.spec.ts b/lib/modules/manager/pip-compile/artifacts.spec.ts
index b410cbce2a..e9ac229bec 100644
--- a/lib/modules/manager/pip-compile/artifacts.spec.ts
+++ b/lib/modules/manager/pip-compile/artifacts.spec.ts
@@ -27,7 +27,11 @@ const adminConfig: RepoGlobalConfig = {
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
};
-const dockerAdminConfig = { ...adminConfig, binarySource: 'docker' };
+const dockerAdminConfig = {
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+};
process.env.BUILDPACK = 'true';
@@ -122,7 +126,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
).not.toBeNull();
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -133,7 +137,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.10.2 ' +
'&& ' +
@@ -247,7 +251,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
).not.toBeNull();
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -258,7 +262,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.10.2 ' +
'&& ' +
diff --git a/lib/modules/manager/pip_requirements/artifacts.spec.ts b/lib/modules/manager/pip_requirements/artifacts.spec.ts
index adaeacf6d3..e8fbbf585c 100644
--- a/lib/modules/manager/pip_requirements/artifacts.spec.ts
+++ b/lib/modules/manager/pip_requirements/artifacts.spec.ts
@@ -187,7 +187,11 @@ describe('modules/manager/pip_requirements/artifacts', () => {
});
it('supports docker mode', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
fs.readLocalFile.mockResolvedValueOnce('new content');
fs.ensureCacheDir.mockResolvedValueOnce('/tmp/cache');
// hashin
@@ -214,7 +218,7 @@ describe('modules/manager/pip_requirements/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -225,7 +229,7 @@ describe('modules/manager/pip_requirements/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.10.2 ' +
'&& ' +
diff --git a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
index 184fb21b84..a66e1c1d65 100644
--- a/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/modules/manager/pipenv/__snapshots__/artifacts.spec.ts.snap
@@ -99,7 +99,7 @@ exports[`modules/manager/pipenv/artifacts returns updated Pipfile.lock 1`] = `
exports[`modules/manager/pipenv/artifacts supports docker mode 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -111,7 +111,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -138,7 +138,7 @@ exports[`modules/manager/pipenv/artifacts supports docker mode 1`] = `
exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -150,7 +150,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -176,7 +176,7 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile 1`] =
exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile dev packages 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -188,7 +188,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -214,7 +214,7 @@ exports[`modules/manager/pipenv/artifacts uses pipenv version from Pipfile dev p
exports[`modules/manager/pipenv/artifacts uses pipenv version from config 1`] = `
[
{
- "cmd": "docker pull containerbase/sidecar",
+ "cmd": "docker pull ghcr.io/containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -226,7 +226,7 @@ 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" 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 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"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/pipenv/artifacts.spec.ts b/lib/modules/manager/pipenv/artifacts.spec.ts
index 5f8d14acd0..40f2a7c43a 100644
--- a/lib/modules/manager/pipenv/artifacts.spec.ts
+++ b/lib/modules/manager/pipenv/artifacts.spec.ts
@@ -36,7 +36,11 @@ const adminConfig: RepoGlobalConfig = {
cacheDir: join('/tmp/renovate/cache'),
containerbaseDir: join('/tmp/renovate/cache/containerbase'),
};
-const dockerAdminConfig = { ...adminConfig, binarySource: 'docker' };
+const dockerAdminConfig = {
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+};
const config: UpdateArtifactsConfig = {};
const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true };
diff --git a/lib/modules/manager/poetry/artifacts.spec.ts b/lib/modules/manager/poetry/artifacts.spec.ts
index 67cc4098f8..d09a0908d7 100644
--- a/lib/modules/manager/poetry/artifacts.spec.ts
+++ b/lib/modules/manager/poetry/artifacts.spec.ts
@@ -250,7 +250,11 @@ describe('modules/manager/poetry/artifacts', () => {
});
it('returns updated poetry.lock using docker', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const execSnapshots = mockExecAll();
fs.ensureCacheDir.mockResolvedValueOnce('/tmp/renovate/cache/others/pip');
// poetry.lock
@@ -288,7 +292,7 @@ describe('modules/manager/poetry/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -299,7 +303,7 @@ describe('modules/manager/poetry/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.4.2 ' +
'&& ' +
@@ -312,7 +316,11 @@ describe('modules/manager/poetry/artifacts', () => {
});
it('returns updated poetry.lock using docker (constraints)', async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const execSnapshots = mockExecAll();
fs.ensureCacheDir.mockResolvedValueOnce('/tmp/renovate/cache/others/pip');
@@ -351,7 +359,7 @@ describe('modules/manager/poetry/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull containerbase/sidecar' },
+ { cmd: 'docker pull ghcr.io/containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -362,7 +370,7 @@ describe('modules/manager/poetry/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 2.7.5 ' +
'&& ' +
diff --git a/lib/modules/manager/pub/artifacts.spec.ts b/lib/modules/manager/pub/artifacts.spec.ts
index af46405b09..f051bb8665 100644
--- a/lib/modules/manager/pub/artifacts.spec.ts
+++ b/lib/modules/manager/pub/artifacts.spec.ts
@@ -141,7 +141,11 @@ describe('modules/manager/pub/artifacts', () => {
});
it(`supports ${params.sdk} docker mode`, async () => {
- GlobalConfig.set({ ...adminConfig, binarySource: 'docker' });
+ GlobalConfig.set({
+ ...adminConfig,
+ binarySource: 'docker',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
const execSnapshots = mockExecAll();
fs.getSiblingFileName.mockReturnValueOnce(lockFile);
fs.readLocalFile.mockResolvedValueOnce(oldLockFileContent);
@@ -162,7 +166,7 @@ describe('modules/manager/pub/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull containerbase/sidecar',
+ cmd: 'docker pull ghcr.io/containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -175,7 +179,7 @@ describe('modules/manager/pub/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'containerbase/sidecar ' +
+ 'ghcr.io/containerbase/sidecar ' +
'bash -l -c "' +
`install-tool ${params.sdk} 3.3.9` +
' && ' +
diff --git a/lib/util/exec/docker/index.spec.ts b/lib/util/exec/docker/index.spec.ts
index b0a2904ab6..7bf1e5ce91 100644
--- a/lib/util/exec/docker/index.spec.ts
+++ b/lib/util/exec/docker/index.spec.ts
@@ -226,11 +226,14 @@ describe('util/exec/docker/index', () => {
(opts ? `${opts} ` : '') +
`-e FOO -e BAR ` +
`-w "/tmp/foobar" ` +
- `containerbase/${img} ` +
+ `ghcr.io/containerbase/sidecar ` +
`bash -l -c "foo && bar"`;
beforeEach(() => {
- GlobalConfig.set({ dockerUser: 'some-user' });
+ GlobalConfig.set({
+ dockerUser: 'some-user',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ });
});
it('returns executable command', async () => {
@@ -268,6 +271,7 @@ describe('util/exec/docker/index', () => {
cacheDir: '/tmp/cache',
containerbaseDir: '/tmp/containerbase',
dockerUser: 'some-user',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
});
const volumes: VolumeOption[] = ['/tmp/foo'];
const res = await generateDockerCommand(commands, preCommands, {
@@ -288,6 +292,7 @@ describe('util/exec/docker/index', () => {
cacheDir: '/tmp/cache',
containerbaseDir: '/tmp/cache/containerbase',
dockerUser: 'some-user',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
});
const volumes: VolumeOption[] = ['/tmp/foo'];
const res = await generateDockerCommand(commands, preCommands, {
diff --git a/lib/util/exec/docker/index.ts b/lib/util/exec/docker/index.ts
index 65a2b4fbb0..a49ce0d846 100644
--- a/lib/util/exec/docker/index.ts
+++ b/lib/util/exec/docker/index.ts
@@ -6,7 +6,6 @@ import { getPkgReleases } from '../../../modules/datasource';
import * as versioning from '../../../modules/versioning';
import { newlineRegex, regEx } from '../../regex';
import { uniq } from '../../uniq';
-import { ensureTrailingSlash } from '../../url';
import { rawExec } from '../common';
import type { DockerOptions, Opt, VolumeOption, VolumesPair } from '../types';
@@ -218,7 +217,7 @@ export async function generateDockerCommand(
dockerUser,
dockerChildPrefix,
dockerCliOptions,
- dockerImagePrefix,
+ dockerSidecarImage,
} = GlobalConfig.get();
const result = ['docker run --rm'];
const containerName = getContainerName(image, dockerChildPrefix);
@@ -258,9 +257,8 @@ export async function generateDockerCommand(
result.push(`-w "${cwd}"`);
}
- image = `${ensureTrailingSlash(
- dockerImagePrefix ?? 'containerbase'
- )}${image}`;
+ // TODO: #7154
+ image = dockerSidecarImage!;
// TODO: add constraint: const tag = getDockerTag(image, sideCarImageVersion, 'semver');
logger.debug(
diff --git a/lib/util/exec/index.spec.ts b/lib/util/exec/index.spec.ts
index a72aa0ee55..d1f3444e39 100644
--- a/lib/util/exec/index.spec.ts
+++ b/lib/util/exec/index.spec.ts
@@ -38,7 +38,11 @@ describe('util/exec/index', () => {
const defaultCacheVolume = `-v "${cacheDir}":"${cacheDir}"`;
const defaultVolumes = `-v "${cwd}":"${cwd}" ${defaultCacheVolume}`;
- const globalConfig: RepoGlobalConfig = { cacheDir, containerbaseDir };
+ const globalConfig: RepoGlobalConfig = {
+ cacheDir,
+ containerbaseDir,
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
+ };
beforeEach(() => {
dockerModule.resetPrefetchedImages();
@@ -54,7 +58,7 @@ describe('util/exec/index', () => {
});
const image = dockerModule.sideCarImage;
- const fullImage = `containerbase/${image}`;
+ const fullImage = `ghcr.io/containerbase/sidecar`;
const name = `renovate_${image}`;
const inCmd = 'echo hello';
const outCmd = ['echo hello'];
@@ -432,7 +436,7 @@ describe('util/exec/index', () => {
},
],
adminConfig: {
- dockerImagePrefix: 'ghcr.io/containerbase',
+ dockerSidecarImage: 'ghcr.io/containerbase/sidecar',
binarySource: 'docker',
},
},
diff --git a/renovate.json b/renovate.json
index 86850e28ad..4824b2dfe9 100644
--- a/renovate.json
+++ b/renovate.json
@@ -29,5 +29,14 @@
"matchPaths": ["**/__fixtures__/**"],
"enabled": false
}
+ ],
+ "regexManagers": [
+ {
+ "fileMatch": ["config/options/index.ts"],
+ "matchStrings": [
+ "default: '(?<depName>ghcr.io/containerbase/sidecar):(?<currentValue>.*)'"
+ ],
+ "datasourceTemplate": "docker"
+ }
]
}
--
GitLab