Merge pull request #1332 from mouyong/master
update jenkins from 2.73.2 to 2.89.2 and fix nginx/Dockerfile syntax error.
This commit is contained in:
		@@ -36,10 +36,12 @@ 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
 | 
			
		||||
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
 | 
			
		||||
 
 | 
			
		||||
@@ -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 \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user