3.11.6 #1

Merged
jonny merged 3 commits from 3.11.6 into master 2020-07-20 15:25:14 +00:00
2 changed files with 35 additions and 17 deletions
Showing only changes of commit 24144e3f30 - Show all commits

View File

@ -1,8 +1,8 @@
FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11 FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.12
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.18.0 ENV NGINX_VERSION 1.19.1
RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& CONFIG="\ && CONFIG="\

48
Jenkinsfile vendored
View File

@ -1,17 +1,35 @@
node("docker-node") { podTemplate(yaml: """
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { kind: Pod
spec:
git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-nginx", credentialsId: 'jenkins-to-git' containers:
- name: kaniko
sh "git rev-parse HEAD > .git/commit-id" image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
def commit_id = readFile('.git/commit-id').trim() imagePullPolicy: Always
println commit_id command:
- /busybox/cat
stage "build" tty: true
def app = docker.build "library/x86_64/alpine/nginx-source" volumeMounts:
- name: jenkins-docker-cfg
stage "publish" mountPath: /kaniko/.docker
app.push("${env.BUILD_NUMBER}") volumes:
app.push("latest") - name: jenkins-docker-cfg
projected:
sources:
- secret:
name: regcred
items:
- key: .dockerconfigjson
path: config.json
"""
) {
node(POD_LABEL) {
stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-nginx.git', credentialsId: 'jenkins-to-git'
container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/nginx:1.19.1'
}
} }
}
} }