Jenkins 2.60.3 #3431
Merged
Jenkins 2.60.3 #3431
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@carlossg thanks for taking are of this |
|
Maybe we could later (as 2.73.x is out) push an updated 2.60.3 to dump as entrypoint a WARNING aboud deprecation, so our users know image has moved to |
|
Indeed, thanks! ❤️ Pushing an updated entrypoint post next-LTS sounds fine from our POV. 👍 LGTM Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index ca323d2..43bd815 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,2 +1,2 @@
-jenkins:2.60.2 @ amd64
-jenkins:2.60.2-alpine @ amd64
+jenkins:2.60.3 @ amd64
+jenkins:2.60.3-alpine @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index d7b0345..0c4d1f9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
-jenkins:2.60.2
-jenkins:2.60.2-alpine
+jenkins:2.60.3
+jenkins:2.60.3-alpine
jenkins:alpine
jenkins:latest
diff --git a/jenkins_2.60.2-alpine/Dockerfile b/jenkins_2.60.3-alpine/Dockerfile
similarity index 93%
rename from jenkins_2.60.2-alpine/Dockerfile
rename to jenkins_2.60.3-alpine/Dockerfile
index c33f136..d9d143b 100644
--- a/jenkins_2.60.2-alpine/Dockerfile
+++ b/jenkins_2.60.3-alpine/Dockerfile
@@ -38,10 +38,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.60.2}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.60.3}
# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=14d0788d89be82958a46965de039a55813f9727bd4d0592dc77905976483ba95
+ARG JENKINS_SHA=2d71b8f87c8417f9303a73d52901a59678ee6c0eefcf7325efed6035ff39372a
# 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
@@ -52,6 +52,7 @@ RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \
&& echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c -
ENV JENKINS_UC https://updates.jenkins.io
+ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental
RUN chown -R ${user} "$JENKINS_HOME" /usr/share/jenkins/ref
# for main web interface:
diff --git a/jenkins_2.60.2/Dockerfile-alpine b/jenkins_2.60.3-alpine/Dockerfile-alpine
similarity index 92%
copy from jenkins_2.60.2/Dockerfile-alpine
copy to jenkins_2.60.3-alpine/Dockerfile-alpine
index 865e166..cba9330 100644
--- a/jenkins_2.60.2/Dockerfile-alpine
+++ b/jenkins_2.60.3-alpine/Dockerfile-alpine
@@ -1,3 +1,4 @@
+# DO NOT UPGRADE alpine until https://github.com/jenkinsci/docker/issues/508 is fixed
FROM openjdk:8u121-jdk-alpine
RUN apk add --no-cache git openssh-client curl unzip bash ttf-dejavu coreutils
@@ -38,10 +39,11 @@ 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.60.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.60.3}
# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=34fde424dde0e050738f5ad1e316d54f741c237bd380bd663a07f96147bb1390
+ARG JENKINS_SHA=2d71b8f87c8417f9303a73d52901a59678ee6c0eefcf7325efed6035ff39372a
+
# 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.60.2-alpine/init.groovy b/jenkins_2.60.3-alpine/init.groovy
similarity index 100%
rename from jenkins_2.60.2-alpine/init.groovy
rename to jenkins_2.60.3-alpine/init.groovy
diff --git a/jenkins_2.60.2-alpine/install-plugins.sh b/jenkins_2.60.3-alpine/install-plugins.sh
similarity index 97%
rename from jenkins_2.60.2-alpine/install-plugins.sh
rename to jenkins_2.60.3-alpine/install-plugins.sh
index acef5b5..10031b4 100755
--- a/jenkins_2.60.2-alpine/install-plugins.sh
+++ b/jenkins_2.60.3-alpine/install-plugins.sh
@@ -66,6 +66,9 @@ doDownload() {
# If version-specific Update Center is available, which is the case for LTS versions,
# use it to resolve latest versions.
url="$JENKINS_UC_LATEST/latest/${plugin}.hpi"
+ elif [[ "$version" == "experimental" && -n "$JENKINS_UC_EXPERIMENTAL" ]]; then
+ # Download from the experimental update center
+ url="$JENKINS_UC_EXPERIMENTAL/latest/${plugin}.hpi"
else
JENKINS_UC_DOWNLOAD=${JENKINS_UC_DOWNLOAD:-"$JENKINS_UC/download"}
url="$JENKINS_UC_DOWNLOAD/plugins/$plugin/$version/${plugin}.hpi"
diff --git a/jenkins_2.60.2-alpine/jenkins-support b/jenkins_2.60.3-alpine/jenkins-support
similarity index 100%
rename from jenkins_2.60.2-alpine/jenkins-support
rename to jenkins_2.60.3-alpine/jenkins-support
diff --git a/jenkins_2.60.2-alpine/jenkins.sh b/jenkins_2.60.3-alpine/jenkins.sh
similarity index 87%
rename from jenkins_2.60.2-alpine/jenkins.sh
rename to jenkins_2.60.3-alpine/jenkins.sh
index 0a3b96c..e23ac68 100755
--- a/jenkins_2.60.2-alpine/jenkins.sh
+++ b/jenkins_2.60.3-alpine/jenkins.sh
@@ -3,7 +3,7 @@
: "${JENKINS_HOME:="/var/jenkins_home"}"
touch "${COPY_REFERENCE_FILE_LOG}" || { echo "Can not write to ${COPY_REFERENCE_FILE_LOG}. Wrong volume permissions?"; exit 1; }
echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
-find /usr/share/jenkins/ref/ -type f -exec bash -c '. /usr/local/bin/jenkins-support; for arg; do copy_reference_file "$arg"; done' _ {} +
+find /usr/share/jenkins/ref/ \( -type f -o -type l \) -exec bash -c '. /usr/local/bin/jenkins-support; for arg; do copy_reference_file "$arg"; done' _ {} +
# if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
diff --git a/jenkins_2.60.2-alpine/plugins.sh b/jenkins_2.60.3-alpine/plugins.sh
similarity index 100%
rename from jenkins_2.60.2-alpine/plugins.sh
rename to jenkins_2.60.3-alpine/plugins.sh
diff --git a/jenkins_2.60.2/Dockerfile b/jenkins_2.60.3/Dockerfile
similarity index 93%
rename from jenkins_2.60.2/Dockerfile
rename to jenkins_2.60.3/Dockerfile
index 9609765..31d88ce 100644
--- a/jenkins_2.60.2/Dockerfile
+++ b/jenkins_2.60.3/Dockerfile
@@ -38,10 +38,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.60.2}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.60.3}
# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=14d0788d89be82958a46965de039a55813f9727bd4d0592dc77905976483ba95
+ARG JENKINS_SHA=2d71b8f87c8417f9303a73d52901a59678ee6c0eefcf7325efed6035ff39372a
# 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
@@ -52,6 +52,7 @@ RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \
&& echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c -
ENV JENKINS_UC https://updates.jenkins.io
+ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental
RUN chown -R ${user} "$JENKINS_HOME" /usr/share/jenkins/ref
# for main web interface:
diff --git a/jenkins_2.60.2/Dockerfile-alpine b/jenkins_2.60.3/Dockerfile-alpine
similarity index 92%
rename from jenkins_2.60.2/Dockerfile-alpine
rename to jenkins_2.60.3/Dockerfile-alpine
index 865e166..cba9330 100644
--- a/jenkins_2.60.2/Dockerfile-alpine
+++ b/jenkins_2.60.3/Dockerfile-alpine
@@ -1,3 +1,4 @@
+# DO NOT UPGRADE alpine until https://github.com/jenkinsci/docker/issues/508 is fixed
FROM openjdk:8u121-jdk-alpine
RUN apk add --no-cache git openssh-client curl unzip bash ttf-dejavu coreutils
@@ -38,10 +39,11 @@ 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.60.1}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.60.3}
# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=34fde424dde0e050738f5ad1e316d54f741c237bd380bd663a07f96147bb1390
+ARG JENKINS_SHA=2d71b8f87c8417f9303a73d52901a59678ee6c0eefcf7325efed6035ff39372a
+
# 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.60.2/init.groovy b/jenkins_2.60.3/init.groovy
similarity index 100%
rename from jenkins_2.60.2/init.groovy
rename to jenkins_2.60.3/init.groovy
diff --git a/jenkins_2.60.2/install-plugins.sh b/jenkins_2.60.3/install-plugins.sh
similarity index 97%
rename from jenkins_2.60.2/install-plugins.sh
rename to jenkins_2.60.3/install-plugins.sh
index acef5b5..10031b4 100755
--- a/jenkins_2.60.2/install-plugins.sh
+++ b/jenkins_2.60.3/install-plugins.sh
@@ -66,6 +66,9 @@ doDownload() {
# If version-specific Update Center is available, which is the case for LTS versions,
# use it to resolve latest versions.
url="$JENKINS_UC_LATEST/latest/${plugin}.hpi"
+ elif [[ "$version" == "experimental" && -n "$JENKINS_UC_EXPERIMENTAL" ]]; then
+ # Download from the experimental update center
+ url="$JENKINS_UC_EXPERIMENTAL/latest/${plugin}.hpi"
else
JENKINS_UC_DOWNLOAD=${JENKINS_UC_DOWNLOAD:-"$JENKINS_UC/download"}
url="$JENKINS_UC_DOWNLOAD/plugins/$plugin/$version/${plugin}.hpi"
diff --git a/jenkins_2.60.2/jenkins-support b/jenkins_2.60.3/jenkins-support
similarity index 100%
rename from jenkins_2.60.2/jenkins-support
rename to jenkins_2.60.3/jenkins-support
diff --git a/jenkins_2.60.2/jenkins.sh b/jenkins_2.60.3/jenkins.sh
similarity index 87%
rename from jenkins_2.60.2/jenkins.sh
rename to jenkins_2.60.3/jenkins.sh
index 0a3b96c..e23ac68 100755
--- a/jenkins_2.60.2/jenkins.sh
+++ b/jenkins_2.60.3/jenkins.sh
@@ -3,7 +3,7 @@
: "${JENKINS_HOME:="/var/jenkins_home"}"
touch "${COPY_REFERENCE_FILE_LOG}" || { echo "Can not write to ${COPY_REFERENCE_FILE_LOG}. Wrong volume permissions?"; exit 1; }
echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
-find /usr/share/jenkins/ref/ -type f -exec bash -c '. /usr/local/bin/jenkins-support; for arg; do copy_reference_file "$arg"; done' _ {} +
+find /usr/share/jenkins/ref/ \( -type f -o -type l \) -exec bash -c '. /usr/local/bin/jenkins-support; for arg; do copy_reference_file "$arg"; done' _ {} +
# if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
diff --git a/jenkins_2.60.2/plugins.sh b/jenkins_2.60.3/plugins.sh
similarity index 100%
rename from jenkins_2.60.2/plugins.sh
rename to jenkins_2.60.3/plugins.shBuild test of #3431; de4eb75 ( $ bashbrew build jenkins:latest
Building bashbrew/cache:82c5b5f88d6686e8ebe8e7e1142d80a530ac601455c407f4ead6b27aaa6a2836 (jenkins:latest)
Tagging jenkins:latest
Tagging jenkins:2.60.3
$ 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:8e60173ba61ce31800aa7ba63273a47f5e280aa32ed323c5dbd9ad5477869b21 (jenkins:alpine)
Tagging jenkins:alpine
Tagging jenkins:2.60.3-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
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.