Update to latest version of docker/agent (#240)

jenkinsci · Sep 6, 2021 · ee8ab6c · ee8ab6c
1 parent f00d79f
commit ee8ab6c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 54 deletions.
diff --git a/11/windows/windowsservercore-1809/Dockerfile b/11/windows/windowsservercore-1809/Dockerfile
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -63,18 +63,23 @@ pipeline {
                     steps {
                         script {
                             def branchName = "${env.BRANCH_NAME}"
-                            if (branchName ==~ 'master') {
-                                // publish the images to Dockerhub
-                                infra.withDockerCredentials {
+                            infra.withDockerCredentials {
+                                if (branchName ==~ 'master') {
+                                    // publish the images to Dockerhub
+                                        sh '''
+                                          docker buildx create --use
+                                          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+                                          docker buildx bake --push --file docker-bake.hcl linux
+                                        '''
+                                } else if (env.TAG_NAME == null) {
+                                    sh 'make build'
+                                    sh 'make test'
                                     sh '''
-                                      docker buildx create --use
-                                      docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-                                      docker buildx bake --push --file docker-bake.hcl linux
+                                          docker buildx create --use
+                                          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+                                          docker buildx bake --file docker-bake.hcl linux
                                     '''
                                 }
-                            } else if (env.TAG_NAME == null) {
-                                sh 'make build'
-                                sh 'make test'
                             }
 
                             if(env.TAG_NAME != null) {

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ To run a Docker container
 
   Windows agent:
 
-    docker run jenkins/inbound-agent:windowsservercore-1809 -Url http://jenkins-server:port -Secret <secret> -Name <agent name>
+    docker run jenkins/inbound-agent:windowsservercore-ltsc2019 -Url http://jenkins-server:port -Secret <secret> -Name <agent name>
 
 To run a Docker container with [Work Directory](https://github.com/jenkinsci/remoting/blob/master/docs/workDir.md)
 
@@ -34,7 +34,7 @@ To run a Docker container with [Work Directory](https://github.com/jenkinsci/rem
 
   Windows agent:
 
-    docker run jenkins/inbound-agent:windowsservercore-1809 -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret <secret> -Name <agent name>
+    docker run jenkins/inbound-agent:windowsservercore-ltsc2019 -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret <secret> -Name <agent name>
 
 Optional environment variables:
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -23,7 +23,7 @@ group "linux-ppc64le" {
 
 # update this to use a newer build number for jenkins/docker image
 variable "AGENT_IMAGE_BUILD_NUMBER" {
-  default = "1"
+  default = "4"
 }
 
 variable "REGISTRY" {
@@ -104,5 +104,5 @@ target "debian_jdk11" {
     "${REGISTRY}/${JENKINS_REPO}:latest",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk11",
   ]
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/s390x"]
 }