From cfe6e254a72b6d5f1adb6a283a732025dadfe2da Mon Sep 17 00:00:00 2001 From: mouyong Date: Sat, 30 Dec 2017 13:38:07 +0800 Subject: [PATCH 1/3] update jenkins from 2.73.2 to 2.89.2 --- jenkins/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index cfcba23f..418d22c2 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -36,10 +36,15 @@ 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.73.2} +#ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2} # jenkins.war checksum, download will be validated using it -ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 +# 2.73.2 +#ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 +# 2.89.2 +ARG JENKINS_SHA=014f669f32bc6e925e926e260503670b32662f006799b133a031a70a794c8a14 + # 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 From 07acf291fa54f1190ae59534efc8ff7b60950216 Mon Sep 17 00:00:00 2001 From: mouyong Date: Sat, 30 Dec 2017 13:41:54 +0800 Subject: [PATCH 2/3] remove line 2.73.2 --- jenkins/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 418d22c2..cb12f4b9 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -36,12 +36,9 @@ 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.73.2} ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2} # jenkins.war checksum, download will be validated using it -# 2.73.2 -#ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 # 2.89.2 ARG JENKINS_SHA=014f669f32bc6e925e926e260503670b32662f006799b133a031a70a794c8a14 From ee205d11981805821a3f916289cf75ac1b96326b Mon Sep 17 00:00:00 2001 From: mouyong Date: Thu, 4 Jan 2018 13:53:01 +0800 Subject: [PATCH 3/3] [F] fix syntax error. --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 9b7de6fa..84717015 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -9,7 +9,7 @@ ADD nginx.conf /etc/nginx/ ARG CHANGE_SOURCE=false RUN if [ ${CHANGE_SOURCE} = true ]; then \ # Change application source from dl-cdn.alpinelinux.org to aliyun source - RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \ ;fi RUN apk update \