Upgrade docker plugin to v1.2.3
Upgrade the Docker integration plugin for Jenkins
to v1.2.3 and also Jenkins server to v2.222.4
as pre-requisite. All the other dependencies upgrades
are a consequence of the upgrade of the docker plugin.
The config.xml test configuration needs also updating
because of the different confirmation format of the
docker plugin and the new Jenkins version.
The upgrade of the Docker plugin is needed because
of the support for --cap-add option for the Docker
containers created.
Chrome v92 in headless mode requires the extra capability
SYS_ADMIN otherwise it won't be albe to start.
Change-Id: I18805cd7d1317638b8717cef529a6aff895a0fcb
diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/master/Dockerfile
index 628067e..9f58407 100644
--- a/jenkins-docker/master/Dockerfile
+++ b/jenkins-docker/master/Dockerfile
@@ -51,8 +51,6 @@
COPY plugins.txt $JENKINS_REF
RUN cat $JENKINS_REF/plugins.txt | xargs install-plugins.sh
-# Snapshot build of the Jenkins Docker Plugin (includes unix:/// sockets fix)
-ADD $BINTRAY_URL/jenkins-snapshots/com/nirima/docker-plugin/0.16.1-54-gc5c5be1/docker-plugin-0.16.1-54-gc5c5be1.hpi $JENKINS_REF/plugins/docker-plugin.jpi
RUN chown -R jenkins:jenkins $JENKINS_REF
RUN mkdir -p $JENKINS_REF/jobs/gerrit-ci-scripts/ && \
diff --git a/jenkins-docker/master/Makefile b/jenkins-docker/master/Makefile
index 0498bb2..3564585 100644
--- a/jenkins-docker/master/Makefile
+++ b/jenkins-docker/master/Makefile
@@ -6,8 +6,8 @@
OAUTH_SECRET=secret
JENKINS_API_USER=user
JENKINS_API_PASSWORD=pass
-JENKINS_WAR_VER=2.204.1
-JENKINS_WAR_SHA=924d2c9fabfdcacee1bae757337a07d7599eaa35
+JENKINS_WAR_VER=2.222.4
+JENKINS_WAR_SHA=09eff5456a24af88111d4489b99433f24f26b81c
JENKINS_HOME?=~/jenkins_home
DOCKER_GID?=993
IMAGE=${ORGANISATION}/${NAME}:${JENKINS_WAR_VER}
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 4162268..88b9f53 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.1' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors>
<string>hudson.diagnosis.ReverseProxySetupMonitor</string>
</disabledAdministrativeMonitors>
- <version>1.613</version>
+ <version>2.222.4</version>
<numExecutors>1</numExecutors>
<mode>EXCLUSIVE</mode>
<useSecurity>true</useSecurity>
@@ -26,28 +26,22 @@
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
- <markupFormatter class="hudson.markup.RawHtmlMarkupFormatter" plugin="antisamy-markup-formatter@1.3">
+ <markupFormatter class="hudson.markup.RawHtmlMarkupFormatter" plugin="antisamy-markup-formatter@1.5">
<disableSyntaxHighlighting>false</disableSyntaxHighlighting>
</markupFormatter>
<jdks/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds>
- <com.nirima.jenkins.plugins.docker.DockerCloud plugin="docker-plugin@0.16.0">
+ <com.nirima.jenkins.plugins.docker.DockerCloud plugin="docker-plugin@1.2.3">
<name>dockerhost</name>
<templates>
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>bazel-debian-chrome80</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -82,15 +76,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>bazel-debian</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -125,15 +113,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>mvn</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -169,15 +151,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>sbt</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -213,15 +189,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>python3</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -256,15 +226,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>jekyll</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
@@ -299,15 +263,9 @@
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
<labelString>aws</labelString>
- <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
- <sshConnector plugin="ssh-slaves@1.11">
- <port>22</port>
- <jvmOptions></jvmOptions>
- <javaPath></javaPath>
- <maxNumRetries>0</maxNumRetries>
- <retryWaitTime>0</retryWaitTime>
- </sshConnector>
- </launcher>
+ <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+ <user>jenkins</user>
+ </connector>
<remoteFsMapping></remoteFsMapping>
<remoteFs>/home/jenkins</remoteFs>
<instanceCap>5</instanceCap>
diff --git a/jenkins-docker/master/plugins.txt b/jenkins-docker/master/plugins.txt
index abaca17..0becdbb 100644
--- a/jenkins-docker/master/plugins.txt
+++ b/jenkins-docker/master/plugins.txt
@@ -24,14 +24,14 @@
build-timeout:1.19
cloudbees-bitbucket-branch-source:2.5.0
cloudbees-folder:6.10.1
-credentials:2.3.0
-credentials-binding:1.18
+credentials:2.3.9
+credentials-binding:1.23
display-url-api:2.3.2
-docker-commons:1.13
-docker-java-api:3.0.14
-docker-plugin:1.1.4
+docker-commons:1.17
+docker-java-api:3.1.5.2
+docker-plugin:1.2.3
docker-workflow:1.17
-durable-task:1.30
+durable-task:1.34
embeddable-build-status:2.0.3
envinject:2.3.0
envinject-api:1.7
@@ -73,19 +73,19 @@
pipeline-stage-step:2.3
pipeline-stage-tags-metadata:1.3.9
pipeline-stage-view:2.10
-plain-credentials:1.4
+plain-credentials:1.6
pubsub-light:1.13
scm-api:2.6.3
script-security:1.66
sse-gateway:1.20
ssh-credentials:1.18
-ssh-slaves:1.26
+ssh-slaves:1.31.2
structs:1.20
-token-macro:2.10
+token-macro:2.12
timestamper:1.8.10
windows-slaves:1.3.1
workflow-aggregator:2.5
-workflow-api:2.37
+workflow-api:2.40
workflow-basic-steps:2.18
workflow-cps:2.74
workflow-cps-global-lib:2.15
@@ -93,5 +93,5 @@
workflow-job:2.35
workflow-multibranch:2.21
workflow-scm-step:2.9
-workflow-step-api:2.20
-workflow-support:3.3
+workflow-step-api:2.22
+workflow-support:3.4
