diff --git a/Dockerfile b/Dockerfile index edad574..faa7185 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13 -LABEL maintainer "Jonathan Ervine " architecture="x86_64" version="10.3.15-r0" date="05022020" +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 +LABEL maintainer "Jonathan Ervine docker@ervine.org" architecture="x86_64" version="10.3.15-r0" date="05022020" RUN apk --no-cache --update add mariadb mariadb-client pwgen && \ rm -f /var/cache/apk/* @@ -11,6 +11,6 @@ RUN mkdir /scripts/pre-exec.d && \ EXPOSE 3306 -VOLUME ["/var/lib/mysql"] +VOLUME /var/lib/mysql ENTRYPOINT ["/scripts/run.sh"] diff --git a/Jenkinsfile b/Jenkinsfile index 7cadf63..a95d701 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ kind: Pod spec: containers: - name: kaniko - image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 + image: gcr.io/kaniko-project/executor:debug imagePullPolicy: Always command: - /busybox/cat @@ -27,12 +27,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-mariadb.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/mariadb:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/mariadb:v3.13' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/mariadb:v3.13.1' } } + stage('Notify gchat') { + hangoutsNotify message: "Alpine Linux 3.13.1 with MariaDB has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + } } } - -stage('Notify gchat') { - hangoutsNotify message: "Alpine Linux 3.13.0 with MariaDB has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false -}