modified: Dockerfile

modified:   Jenkinsfile
This commit is contained in:
Jonathan Ervine 2020-06-05 14:48:26 +08:00
parent 087696f439
commit 39cc651681
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@ FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11
LABEL maintainer="Jonathan Ervine <containers@ervine.org>" "Alpine Linux version"="3.11.3" "NGINX version"="1.17.8" date="19022020" LABEL maintainer="Jonathan Ervine <containers@ervine.org>" "Alpine Linux version"="3.11.3" "NGINX version"="1.17.8" date="19022020"
ENV NGINX_VERSION 1.17.8 ENV NGINX_VERSION 1.18.0
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& CONFIG="\ && CONFIG="\

2
Jenkinsfile vendored
View File

@ -1,7 +1,7 @@
node("docker-node") { node("docker-node") {
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') {
git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-nginx", credentialsId: 'jenkins-to-git' git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-nginx", credentialsId: 'jenkins-to-git'
sh "git rev-parse HEAD > .git/commit-id" sh "git rev-parse HEAD > .git/commit-id"
def commit_id = readFile('.git/commit-id').trim() def commit_id = readFile('.git/commit-id').trim()