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

Revert "Bump docker-builder version on shared library resources to 2.0.9" #299

Merged
merged 2 commits into from
Feb 7, 2022
Merged

Revert "Bump docker-builder version on shared library resources to 2.0.9" #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef088b8
Revert "Bump docker-builder version on shared library resources to 2.…
dduportal Feb 7, 2022
87b22fe
Delete docker-builder.yml
dduportal Feb 7, 2022
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
68 changes: 0 additions & 68 deletions updatecli/updatecli.d/docker-builder.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion vars/buildDockerAndPublishImage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def call(String imageName, Map config=[:]) {
// This container must be named `jnlp` and should use the default entrypoint/cmd (command/args) inherited from inbound-agent parent image
containerTemplate(
name: 'jnlp',
image: config.builderImage ?: 'jenkinsciinfra/builder:2.0.9',
image: config.builderImage ?: 'jenkinsciinfra/builder:2.0.2',
resourceRequestCpu: '2',
resourceLimitCpu: '2',
resourceRequestMemory: '2Gi',
Expand Down
2 changes: 1 addition & 1 deletion vars/buildDockerAndPublishImage.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<li>Boolean automaticSemanticVersioning: (Optional, defaults to "false") Should we create a release for every merge to the mainBranch. This uses "jx-release-version" to determine the version number based on the commit history.</li>
<li>String gitCredentials: (Optional, defaults to "") If "automaticSemanticVersioning" is set, name of the credential to use when tagging the git repository. Support User/password or GitHub App credential types.</li>
<li>String metadataFromSh: (Optional, defaults to "") If "automaticSemanticVersioning" is set, use a script to calculate the build metadata to be appended to the generated version.</li>
<li>String builderImage: (Optional, defaults to "jenkinsciinfra/builder:2.0.9") Docker Image to be used for the container "builder" of the CI pod template.</li>
<li>String builderImage: (Optional, defaults to "jenkinsciinfra/builder:2.0.2") Docker Image to be used for the container "builder" of the CI pod template.</li>
</ul>
</li>
</ul>
Expand Down