Skip to content

Commit

Permalink
fix(buildDockerAndPublishImage) downgrade docker-builder to 2.0.2 (#282)
Browse files Browse the repository at this point in the history
* fix(buildDockerAndPublishImage) downgrade docker-builder to 2.0.2

Temp. fix for jenkins-infra/helpdesk#2190

* Update buildDockerAndPublishImage.txt
  • Loading branch information
dduportal authored Jan 11, 2022
1 parent b936429 commit ca21491
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion vars/buildDockerAndPublishImage.groovy
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.4',
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
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.4") 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

0 comments on commit ca21491

Please sign in to comment.