From ec4b17b8b64ba52e4bfafc1d4f50b8855d216f33 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Wed, 1 Feb 2023 17:47:24 +0100
Subject: [PATCH] feat(config)!: default `dockerImagePrefix` to `containerbase`
(#20150)
Sidecar containers will now use `containerbase/` prefix instead of `renovate/` prefix.
BREAKING CHANGE: containerbase/ account used for sidecar containers instead of renovate/
---
docs/usage/self-hosted-configuration.md | 12 ++++----
lib/config/options/index.ts | 2 +-
lib/modules/manager/bundler/artifacts.spec.ts | 28 +++++++++----------
lib/modules/manager/cargo/artifacts.spec.ts | 4 +--
.../__snapshots__/artifacts.spec.ts.snap | 8 +++---
.../manager/cocoapods/artifacts.spec.ts | 4 +--
.../manager/composer/artifacts.spec.ts | 4 +--
lib/modules/manager/gomod/artifacts.spec.ts | 26 ++++++++---------
.../manager/gradle-wrapper/artifacts.spec.ts | 4 +--
lib/modules/manager/gradle/artifacts.spec.ts | 6 ++--
.../__snapshots__/artifacts.spec.ts.snap | 8 +++---
.../manager/maven-wrapper/artifacts.spec.ts | 4 +--
.../mix/__snapshots__/artifacts.spec.ts.snap | 6 ++--
lib/modules/manager/nix/artifacts.spec.ts | 8 +++---
.../manager/npm/post-update/lerna.spec.ts | 4 +--
.../manager/npm/post-update/npm.spec.ts | 4 +--
.../manager/npm/post-update/pnpm.spec.ts | 4 +--
.../manager/npm/post-update/yarn.spec.ts | 4 +--
lib/modules/manager/nuget/artifacts.spec.ts | 4 +--
.../manager/pip-compile/artifacts.spec.ts | 8 +++---
.../pip_requirements/artifacts.spec.ts | 4 +--
.../__snapshots__/artifacts.spec.ts.snap | 16 +++++------
lib/modules/manager/poetry/artifacts.spec.ts | 8 +++---
lib/modules/manager/pub/artifacts.spec.ts | 4 +--
lib/util/exec/docker/index.spec.ts | 2 +-
lib/util/exec/docker/index.ts | 4 ++-
lib/util/exec/index.spec.ts | 18 ++++++------
27 files changed, 105 insertions(+), 103 deletions(-)
diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
index b0f0c940a3..61a3b3a44a 100644
--- a/docs/usage/self-hosted-configuration.md
+++ b/docs/usage/self-hosted-configuration.md
@@ -302,9 +302,9 @@ You can skip the host part, and use just the datasource and credentials.
Adds a custom prefix to the default Renovate sidecar Docker containers name and label.
-For example, if you set `dockerChildPrefix=myprefix_` then the final container created from the `renovate/node` is:
+For example, if you set `dockerChildPrefix=myprefix_` then the final container created from the `containerbase/sidecar` is:
-- called `myprefix_node` instead of `renovate_node`
+- called `myprefix_sidecar` instead of `renovate_sidecar`
- labeled `myprefix_child` instead of `renovate_child`
<!-- prettier-ignore -->
@@ -313,19 +313,19 @@ For example, if you set `dockerChildPrefix=myprefix_` then the final container c
## dockerImagePrefix
-By default Renovate pulls the sidecar Docker containers from `docker.io/renovate`.
+By default Renovate pulls the sidecar Docker containers from `docker.io/containerbase`.
You can use the `dockerImagePrefix` option to override this default.
-Say you want to pull your images from `ghcr.io/renovatebot`.
+Say you want to pull your images from `ghcr.io/containerbase` to bypass Docker Hub limits.
You would put this in your configuration file:
```json
{
- "dockerImagePrefix": "ghcr.io/renovatebot"
+ "dockerImagePrefix": "ghcr.io/containerbase"
}
```
-If you pulled a new `node` image, the final image would be `ghcr.io/renovatebot/node` instead of `docker.io/renovate/node`.
+Now when Renovate pulls a new `sidecar` image, the final image is `ghcr.io/containerbase/sidecar` instead of `docker.io/containerbase/sidecar`.
## dockerUser
diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
index e062c7f02e..cfbe1b596e 100644
--- a/lib/config/options/index.ts
+++ b/lib/config/options/index.ts
@@ -348,7 +348,7 @@ const options: RenovateOptions[] = [
description:
'Change this value to override the default Renovate Docker sidecar image name prefix.',
type: 'string',
- default: 'docker.io/renovate',
+ default: 'docker.io/containerbase',
globalOnly: true,
},
{
diff --git a/lib/modules/manager/bundler/artifacts.spec.ts b/lib/modules/manager/bundler/artifacts.spec.ts
index 7271c99dab..a2eab121cd 100644
--- a/lib/modules/manager/bundler/artifacts.spec.ts
+++ b/lib/modules/manager/bundler/artifacts.spec.ts
@@ -280,7 +280,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -291,7 +291,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -340,7 +340,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -351,7 +351,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.5' +
' && ' +
@@ -402,7 +402,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -413,7 +413,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.3.0' +
' && ' +
@@ -463,7 +463,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -475,7 +475,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -534,7 +534,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -545,7 +545,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -606,7 +606,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -617,7 +617,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool ruby 1.2.0' +
' && ' +
@@ -677,7 +677,7 @@ describe('modules/manager/bundler/artifacts', () => {
})
).toEqual([updatedGemfileLock]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -688,7 +688,7 @@ describe('modules/manager/bundler/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ '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 f7be45d077..1ad6453f3c 100644
--- a/lib/modules/manager/cargo/artifacts.spec.ts
+++ b/lib/modules/manager/cargo/artifacts.spec.ts
@@ -210,7 +210,7 @@ describe('modules/manager/cargo/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{},
{
cmd:
@@ -220,7 +220,7 @@ describe('modules/manager/cargo/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 f23ccb9731..3dab15063a 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/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" 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/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" 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 514954474d..a4caf0fe10 100644
--- a/lib/modules/manager/cocoapods/artifacts.spec.ts
+++ b/lib/modules/manager/cocoapods/artifacts.spec.ts
@@ -252,7 +252,7 @@ describe('modules/manager/cocoapods/artifacts', () => {
config,
});
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{
cmd:
'docker run --rm --name=renovate_sidecar --label=renovate_child ' +
@@ -261,7 +261,7 @@ describe('modules/manager/cocoapods/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ '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 2191ab49e9..d748617197 100644
--- a/lib/modules/manager/composer/artifacts.spec.ts
+++ b/lib/modules/manager/composer/artifacts.spec.ts
@@ -461,7 +461,7 @@ describe('modules/manager/composer/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
options: {
encoding: 'utf-8',
},
@@ -481,7 +481,7 @@ describe('modules/manager/composer/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ '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 869d5891cf..66e40c293f 100644
--- a/lib/modules/manager/gomod/artifacts.spec.ts
+++ b/lib/modules/manager/gomod/artifacts.spec.ts
@@ -298,7 +298,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -315,7 +315,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -455,7 +455,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -485,7 +485,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -566,7 +566,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{},
{
options: {
@@ -980,7 +980,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{},
{
cmd:
@@ -997,7 +997,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1045,7 +1045,7 @@ describe('modules/manager/gomod/artifacts', () => {
{ file: { contents: 'New go.sum 2', path: 'go.mod', type: 'addition' } },
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{},
{
cmd:
@@ -1062,7 +1062,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.14.0' +
' && ' +
@@ -1779,7 +1779,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
},
{},
{
@@ -1797,7 +1797,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool golang 1.17.0' +
' && ' +
@@ -1854,7 +1854,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
},
{},
{
@@ -1872,7 +1872,7 @@ describe('modules/manager/gomod/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ '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 184e18eac2..d6996cde05 100644
--- a/lib/modules/manager/gradle-wrapper/artifacts.spec.ts
+++ b/lib/modules/manager/gradle-wrapper/artifacts.spec.ts
@@ -198,7 +198,7 @@ describe('modules/manager/gradle-wrapper/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -209,7 +209,7 @@ describe('modules/manager/gradle-wrapper/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ '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 8e0f07e19d..9d890b469d 100644
--- a/lib/modules/manager/gradle/artifacts.spec.ts
+++ b/lib/modules/manager/gradle/artifacts.spec.ts
@@ -279,7 +279,7 @@ describe('modules/manager/gradle/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -290,7 +290,7 @@ describe('modules/manager/gradle/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
@@ -308,7 +308,7 @@ describe('modules/manager/gradle/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar' +
+ 'containerbase/sidecar' +
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
diff --git a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
index 205dd87465..6fcb8eb678 100644
--- a/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/modules/manager/helmv3/__snapshots__/artifacts.spec.ts.snap
@@ -399,7 +399,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 renovate/sidecar",
+ "cmd": "docker pull containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -411,7 +411,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 BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" renovate/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add repo-test --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories ''"",
+ "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 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 --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories ''"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
@@ -518,7 +518,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 renovate/sidecar",
+ "cmd": "docker pull containerbase/sidecar",
"options": {
"encoding": "utf-8",
},
@@ -530,7 +530,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 BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR -w "/tmp/github/some/repo" renovate/sidecar bash -l -c "install-tool helm v3.7.2 && helm repo add stable --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories the_stable_url && helm repo add repo1 --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories the_repo1_url && helm repo add repo-test --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories ''"",
+ "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 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 --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories the_stable_url && helm repo add repo1 --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories the_repo1_url && helm repo add repo-test --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories https://gitlab.com/api/v4/projects/xxxxxxx/packages/helm/stable && helm dependency update --registry-config /tmp/renovate/cache/__renovate-private-cache/registry.json --repository-config /tmp/renovate/cache/__renovate-private-cache/repositories.yaml --repository-cache /tmp/renovate/cache/__renovate-private-cache/repositories ''"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/maven-wrapper/artifacts.spec.ts b/lib/modules/manager/maven-wrapper/artifacts.spec.ts
index c90b68fc70..01e55ce5b2 100644
--- a/lib/modules/manager/maven-wrapper/artifacts.spec.ts
+++ b/lib/modules/manager/maven-wrapper/artifacts.spec.ts
@@ -193,7 +193,7 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
options: { encoding: 'utf-8' },
},
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
@@ -204,7 +204,7 @@ describe('modules/manager/maven-wrapper/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "../.." ' +
- 'renovate/sidecar' +
+ '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 8970d0fae2..8c77419ece 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" renovate/sidecar bash -l -c "install-tool erlang 24.3.4.2 && 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" containerbase/sidecar bash -l -c "install-tool erlang 24.3.4.2 && 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/sidecar bash -l -c "install-tool erlang 24.3.4.2 && 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" containerbase/sidecar bash -l -c "install-tool erlang 24.3.4.2 && 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/nix/artifacts.spec.ts b/lib/modules/manager/nix/artifacts.spec.ts
index 474768a28a..7b4808aed1 100644
--- a/lib/modules/manager/nix/artifacts.spec.ts
+++ b/lib/modules/manager/nix/artifacts.spec.ts
@@ -137,7 +137,7 @@ describe('modules/manager/nix/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -147,7 +147,7 @@ describe('modules/manager/nix/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ 'containerbase/sidecar ' +
'bash -l -c "' +
'install-tool nix 2.10.0 ' +
'&& ' +
@@ -268,7 +268,7 @@ describe('modules/manager/nix/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -278,7 +278,7 @@ describe('modules/manager/nix/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 cacc6fb2a5..b6ae8f2fe7 100644
--- a/lib/modules/manager/npm/post-update/lerna.spec.ts
+++ b/lib/modules/manager/npm/post-update/lerna.spec.ts
@@ -144,7 +144,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -155,7 +155,7 @@ describe('modules/manager/npm/post-update/lerna', () => {
'-v "/tmp/cache":"/tmp/cache" ' +
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
- '-w "some-dir" renovate/sidecar ' +
+ '-w "some-dir" 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 73703f8ef0..3ecda1373e 100644
--- a/lib/modules/manager/npm/post-update/npm.spec.ts
+++ b/lib/modules/manager/npm/post-update/npm.spec.ts
@@ -258,7 +258,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 renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -267,7 +267,7 @@ describe('modules/manager/npm/post-update/npm', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "some-dir" ' +
- 'renovate/sidecar ' +
+ '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 8b23def995..5089b185d1 100644
--- a/lib/modules/manager/npm/post-update/pnpm.spec.ts
+++ b/lib/modules/manager/npm/post-update/pnpm.spec.ts
@@ -223,7 +223,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 renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -232,7 +232,7 @@ describe('modules/manager/npm/post-update/pnpm', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "some-dir" ' +
- 'renovate/sidecar ' +
+ '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 43c775685d..3a52566194 100644
--- a/lib/modules/manager/npm/post-update/yarn.spec.ts
+++ b/lib/modules/manager/npm/post-update/yarn.spec.ts
@@ -555,10 +555,10 @@ describe('modules/manager/npm/post-update/yarn', () => {
expect(res.lockFile).toBe(plocktest1YarnLockV1);
const options = { encoding: 'utf-8' };
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar', options },
+ { cmd: 'docker pull 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" renovate/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" 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 870701c93e..b6ae31d6cc 100644
--- a/lib/modules/manager/nuget/artifacts.spec.ts
+++ b/lib/modules/manager/nuget/artifacts.spec.ts
@@ -249,7 +249,7 @@ describe('modules/manager/nuget/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -264,7 +264,7 @@ describe('modules/manager/nuget/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ 'containerbase/sidecar ' +
'bash -l -c "' +
'install-tool dotnet 7.0.100' +
' && ' +
diff --git a/lib/modules/manager/pip-compile/artifacts.spec.ts b/lib/modules/manager/pip-compile/artifacts.spec.ts
index c55714dda4..94c8463f29 100644
--- a/lib/modules/manager/pip-compile/artifacts.spec.ts
+++ b/lib/modules/manager/pip-compile/artifacts.spec.ts
@@ -114,7 +114,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
).not.toBeNull();
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -125,7 +125,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ 'containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.10.2 ' +
'&& ' +
@@ -231,7 +231,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
).not.toBeNull();
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -242,7 +242,7 @@ describe('modules/manager/pip-compile/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 1031300d02..69e2152cea 100644
--- a/lib/modules/manager/pip_requirements/artifacts.spec.ts
+++ b/lib/modules/manager/pip_requirements/artifacts.spec.ts
@@ -207,7 +207,7 @@ describe('modules/manager/pip_requirements/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -218,7 +218,7 @@ describe('modules/manager/pip_requirements/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 231d1d4330..81581b65c5 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/sidecar bash -l -c "install-tool python 3.7.6 && pip install --user pipenv && 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" containerbase/sidecar bash -l -c "install-tool python 3.7.6 && pip install --user pipenv && 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user 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" containerbase/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user 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" containerbase/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user 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 renovate/sidecar",
+ "cmd": "docker pull 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" renovate/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user 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" containerbase/sidecar bash -l -c "install-tool python 3.10.2 && pip install --user pipenv==2020.1.1 && pipenv lock"",
"options": {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/modules/manager/poetry/artifacts.spec.ts b/lib/modules/manager/poetry/artifacts.spec.ts
index 7ca281a043..733d5ad987 100644
--- a/lib/modules/manager/poetry/artifacts.spec.ts
+++ b/lib/modules/manager/poetry/artifacts.spec.ts
@@ -267,7 +267,7 @@ describe('modules/manager/poetry/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -278,7 +278,7 @@ describe('modules/manager/poetry/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ 'containerbase/sidecar ' +
'bash -l -c "' +
'install-tool python 3.4.2 ' +
'&& ' +
@@ -330,7 +330,7 @@ describe('modules/manager/poetry/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
- { cmd: 'docker pull renovate/sidecar' },
+ { cmd: 'docker pull containerbase/sidecar' },
{ cmd: 'docker ps --filter name=renovate_sidecar -aq' },
{
cmd:
@@ -341,7 +341,7 @@ describe('modules/manager/poetry/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 857f67cd3d..af46405b09 100644
--- a/lib/modules/manager/pub/artifacts.spec.ts
+++ b/lib/modules/manager/pub/artifacts.spec.ts
@@ -162,7 +162,7 @@ describe('modules/manager/pub/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
- cmd: 'docker pull renovate/sidecar',
+ cmd: 'docker pull containerbase/sidecar',
},
{
cmd: 'docker ps --filter name=renovate_sidecar -aq',
@@ -175,7 +175,7 @@ describe('modules/manager/pub/artifacts', () => {
'-e BUILDPACK_CACHE_DIR ' +
'-e CONTAINERBASE_CACHE_DIR ' +
'-w "/tmp/github/some/repo" ' +
- 'renovate/sidecar ' +
+ '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 8231750f0d..cdbfade271 100644
--- a/lib/util/exec/docker/index.spec.ts
+++ b/lib/util/exec/docker/index.spec.ts
@@ -216,7 +216,7 @@ describe('util/exec/docker/index', () => {
(vol ? `${vol} ` : '') +
`-e FOO -e BAR ` +
`-w "/tmp/foobar" ` +
- `renovate/${img} ` +
+ `containerbase/${img} ` +
`bash -l -c "foo && bar"`;
beforeEach(() => {
diff --git a/lib/util/exec/docker/index.ts b/lib/util/exec/docker/index.ts
index d980793c2e..291a97523a 100644
--- a/lib/util/exec/docker/index.ts
+++ b/lib/util/exec/docker/index.ts
@@ -259,7 +259,9 @@ export async function generateDockerCommand(
result.push(`-w "${cwd}"`);
}
- image = `${ensureTrailingSlash(dockerImagePrefix ?? 'renovate')}${image}`;
+ image = `${ensureTrailingSlash(
+ dockerImagePrefix ?? 'containerbase'
+ )}${image}`;
// 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 03f36081d6..909880e061 100644
--- a/lib/util/exec/index.spec.ts
+++ b/lib/util/exec/index.spec.ts
@@ -54,7 +54,7 @@ describe('util/exec/index', () => {
});
const image = dockerModule.sideCarImage;
- const fullImage = `renovate/${image}`;
+ const fullImage = `containerbase/${image}`;
const name = `renovate_${image}`;
const inCmd = 'echo hello';
const outCmd = ['echo hello'];
@@ -397,9 +397,9 @@ describe('util/exec/index', () => {
inCmd,
inOpts: { docker },
outCmd: [
- `docker pull ghcr.io/renovatebot/${image}`,
+ `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/renovatebot/${image} bash -l -c "${inCmd}"`,
+ `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}"`,
],
outOpts: [
dockerPullOpts,
@@ -413,7 +413,7 @@ describe('util/exec/index', () => {
},
],
adminConfig: {
- dockerImagePrefix: 'ghcr.io/renovatebot',
+ dockerImagePrefix: 'ghcr.io/containerbase',
binarySource: 'docker',
},
},
@@ -792,17 +792,17 @@ describe('util/exec/index', () => {
expect(actualCmd).toEqual([
`echo hello`,
`echo hello`,
- `docker pull renovate/${image}`,
+ `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 renovate/${image} bash -l -c "echo hello"`,
+ `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 ps --filter name=renovate_${image} -aq`,
- `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR renovate/${image} bash -l -c "echo hello"`,
+ `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -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 renovate/${image} bash -l -c "echo hello"`,
+ `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 ps --filter name=renovate_${image} -aq`,
- `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR renovate/${image} bash -l -c "echo hello"`,
+ `docker run --rm --name=renovate_${image} --label=renovate_child ${defaultCacheVolume} -e BUILDPACK_CACHE_DIR -e CONTAINERBASE_CACHE_DIR ${fullImage} bash -l -c "echo hello"`,
]);
});
--
GitLab