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.

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

Jenkins 2.32.2 #2605

Merged
merged 1 commit into from
Feb 1, 2017
Merged

Jenkins 2.32.2 #2605

merged 1 commit into from
Feb 1, 2017

Conversation

carlossg
Copy link
Contributor

@carlossg carlossg commented Feb 1, 2017

No description provided.

@MSch
Copy link

MSch commented Feb 1, 2017

@tianon
Copy link
Member

tianon commented Feb 1, 2017

warning: insecure protocol git:// detected: git://github.com/jenkinsci/jenkins-ci.org-docker
diff --git a/jenkins_2.32.1-alpine/Dockerfile b/jenkins_2.32.2-alpine/Dockerfile
similarity index 93%
rename from jenkins_2.32.1-alpine/Dockerfile
rename to jenkins_2.32.2-alpine/Dockerfile
index 7b18b31..73f55f2 100644
--- a/jenkins_2.32.1-alpine/Dockerfile
+++ b/jenkins_2.32.2-alpine/Dockerfile
@@ -25,8 +25,8 @@ VOLUME /var/jenkins_home
 # or config file with your custom jenkins Docker image.
 RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
 
-ENV TINI_VERSION 0.13.1
-ENV TINI_SHA 0f78709a0e3c80e7c9119fdc32c2bc0f4cfc4cab
+ENV TINI_VERSION 0.13.2
+ENV TINI_SHA afbf8de8a63ce8e4f18cb3f34dfdbbd354af68a1
 
 # Use tini as subreaper in Docker container to adopt zombie processes 
 RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
@@ -36,10 +36,10 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
 
 # jenkins version being bundled in this docker image
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.2}
 
 # jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=1b65dc498ba7ab1f5cce64200b920a8716d90834
+ARG JENKINS_SHA=f495a08733f69b1845fd2d9b3a46482adb6e6cee
 
 # Can be used to customize where jenkins.war get downloaded from
 ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
diff --git a/jenkins_2.32.1-alpine/init.groovy b/jenkins_2.32.2-alpine/init.groovy
similarity index 100%
rename from jenkins_2.32.1-alpine/init.groovy
rename to jenkins_2.32.2-alpine/init.groovy
diff --git a/jenkins_2.32.1-alpine/install-plugins.sh b/jenkins_2.32.2-alpine/install-plugins.sh
similarity index 100%
rename from jenkins_2.32.1-alpine/install-plugins.sh
rename to jenkins_2.32.2-alpine/install-plugins.sh
diff --git a/jenkins_2.32.1-alpine/jenkins-support b/jenkins_2.32.2-alpine/jenkins-support
similarity index 100%
rename from jenkins_2.32.1-alpine/jenkins-support
rename to jenkins_2.32.2-alpine/jenkins-support
diff --git a/jenkins_2.32.1-alpine/jenkins.sh b/jenkins_2.32.2-alpine/jenkins.sh
similarity index 100%
rename from jenkins_2.32.1-alpine/jenkins.sh
rename to jenkins_2.32.2-alpine/jenkins.sh
diff --git a/jenkins_2.32.1-alpine/plugins.sh b/jenkins_2.32.2-alpine/plugins.sh
similarity index 100%
rename from jenkins_2.32.1-alpine/plugins.sh
rename to jenkins_2.32.2-alpine/plugins.sh
diff --git a/jenkins_2.32.1/Dockerfile b/jenkins_2.32.2/Dockerfile
similarity index 93%
rename from jenkins_2.32.1/Dockerfile
rename to jenkins_2.32.2/Dockerfile
index 01f8436..bc3445e 100644
--- a/jenkins_2.32.1/Dockerfile
+++ b/jenkins_2.32.2/Dockerfile
@@ -25,8 +25,8 @@ VOLUME /var/jenkins_home
 # or config file with your custom jenkins Docker image.
 RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
 
-ENV TINI_VERSION 0.13.1
-ENV TINI_SHA 0f78709a0e3c80e7c9119fdc32c2bc0f4cfc4cab
+ENV TINI_VERSION 0.13.2
+ENV TINI_SHA afbf8de8a63ce8e4f18cb3f34dfdbbd354af68a1
 
 # Use tini as subreaper in Docker container to adopt zombie processes 
 RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
@@ -36,10 +36,10 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
 
 # jenkins version being bundled in this docker image
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.2}
 
 # jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=1b65dc498ba7ab1f5cce64200b920a8716d90834
+ARG JENKINS_SHA=f495a08733f69b1845fd2d9b3a46482adb6e6cee
 
 # Can be used to customize where jenkins.war get downloaded from
 ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
diff --git a/jenkins_2.32.1/init.groovy b/jenkins_2.32.2/init.groovy
similarity index 100%
rename from jenkins_2.32.1/init.groovy
rename to jenkins_2.32.2/init.groovy
diff --git a/jenkins_2.32.1/install-plugins.sh b/jenkins_2.32.2/install-plugins.sh
similarity index 100%
rename from jenkins_2.32.1/install-plugins.sh
rename to jenkins_2.32.2/install-plugins.sh
diff --git a/jenkins_2.32.1/jenkins-support b/jenkins_2.32.2/jenkins-support
similarity index 100%
rename from jenkins_2.32.1/jenkins-support
rename to jenkins_2.32.2/jenkins-support
diff --git a/jenkins_2.32.1/jenkins.sh b/jenkins_2.32.2/jenkins.sh
similarity index 100%
rename from jenkins_2.32.1/jenkins.sh
rename to jenkins_2.32.2/jenkins.sh
diff --git a/jenkins_2.32.1/plugins.sh b/jenkins_2.32.2/plugins.sh
similarity index 100%
rename from jenkins_2.32.1/plugins.sh
rename to jenkins_2.32.2/plugins.sh

@tianon
Copy link
Member

tianon commented Feb 1, 2017

LGTM

Build test of #2605; 8349f1b (jenkins):

$ bashbrew build jenkins:latest
warning: insecure protocol git:// detected: git://github.com/jenkinsci/jenkins-ci.org-docker
Building bashbrew/cache:3064c573cd745b0d79946bc75835ff627a09e1c2699e18ae3f3c6592b6aeb58a (jenkins:latest)
Tagging jenkins:latest
Tagging jenkins:2.32.2

$ test/run.sh jenkins:latest
testing jenkins:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build jenkins:alpine
Building bashbrew/cache:24a8fb72a9aa4d361dbec9c8b6d634001870838354e28d0a4e45468314edbb1b (jenkins:alpine)
Tagging jenkins:alpine
Tagging jenkins:2.32.2-alpine

$ test/run.sh jenkins:alpine
testing jenkins:alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 71d43ff into docker-library:master Feb 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants