Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(config): default dockerImagePrefix to containerbase #20150

Merged
merged 3 commits into from
Feb 1, 2023
Merged

feat(config): default dockerImagePrefix to containerbase #20150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ceccfd
feat(config): default `dockerImagePrefix` to `containerbase`
viceice Feb 1, 2023
0edebfa
test: fix tests
viceice Feb 1, 2023
3c0133c
Apply suggestions from code review
viceice Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/usage/self-hosted-configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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`.
viceice marked this conversation as resolved.
Show resolved Hide resolved
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

Expand Down
2 changes: 1 addition & 1 deletion lib/config/options/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{
Expand Down
28 changes: 14 additions & 14 deletions lib/modules/manager/bundler/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,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:
Expand All @@ -279,7 +279,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' +
' && ' +
Expand Down Expand Up @@ -326,7 +326,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:
Expand All @@ -337,7 +337,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' +
' && ' +
Expand Down Expand Up @@ -386,7 +386,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:
Expand All @@ -397,7 +397,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' +
' && ' +
Expand Down Expand Up @@ -445,7 +445,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:
Expand All @@ -457,7 +457,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' +
' && ' +
Expand Down Expand Up @@ -514,7 +514,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:
Expand All @@ -525,7 +525,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' +
' && ' +
Expand Down Expand Up @@ -584,7 +584,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:
Expand All @@ -595,7 +595,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' +
' && ' +
Expand Down Expand Up @@ -653,7 +653,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:
Expand All @@ -664,7 +664,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' +
' && ' +
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/cargo/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ describe('modules/manager/cargo/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
{ cmd: 'docker pull renovate/sidecar' },
{ cmd: 'docker pull containerbase/sidecar' },
{},
{
cmd:
Expand All @@ -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' +
' && ' +
Expand Down
8 changes: 4 additions & 4 deletions lib/modules/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/cocoapods/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,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 ' +
Expand All @@ -253,7 +253,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' +
' && ' +
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/composer/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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' +
' && ' +
Expand Down
26 changes: 13 additions & 13 deletions lib/modules/manager/gomod/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,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:
Expand All @@ -307,7 +307,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' +
' && ' +
Expand Down Expand Up @@ -441,7 +441,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:
Expand Down Expand Up @@ -471,7 +471,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' +
' && ' +
Expand Down Expand Up @@ -550,7 +550,7 @@ describe('modules/manager/gomod/artifacts', () => {
},
]);
expect(execSnapshots).toMatchObject([
{ cmd: 'docker pull renovate/sidecar' },
{ cmd: 'docker pull containerbase/sidecar' },
{},
{
options: {
Expand Down Expand Up @@ -952,7 +952,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:
Expand All @@ -969,7 +969,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' +
' && ' +
Expand Down Expand Up @@ -1015,7 +1015,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:
Expand All @@ -1032,7 +1032,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' +
' && ' +
Expand Down Expand Up @@ -1472,7 +1472,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
cmd: 'docker pull renovate/sidecar',
cmd: 'docker pull containerbase/sidecar',
},
{},
{
Expand All @@ -1490,7 +1490,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' +
' && ' +
Expand Down Expand Up @@ -1544,7 +1544,7 @@ describe('modules/manager/gomod/artifacts', () => {
]);
const expectedResult = [
{
cmd: 'docker pull renovate/sidecar',
cmd: 'docker pull containerbase/sidecar',
},
{},
{
Expand All @@ -1562,7 +1562,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' +
' && ' +
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/manager/gradle-wrapper/artifacts.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,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:
Expand All @@ -210,7 +210,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' +
' && ' +
Expand Down
Loading