diff --git a/Dockerfile b/Dockerfile index b36116c..89a424d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.12 -LABEL MAINTAINER="Jonathan Ervine " +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 +LABEL MAINTAINER="Jonathan Ervine docker@ervine.org" # Install updates ENV LANG='en_US.UTF-8' \ @@ -10,8 +10,8 @@ ENV LANG='en_US.UTF-8' \ RUN apk update && \ apk -U upgrade --ignore alpine-baselayout && \ apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git curl && \ - adduser -D python && \ - mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/flask-python-helm /data && \ + adduser -D helm-web && \ + mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/flask-python-helm.git /data && \ pip3 install -r /data/requirements.txt && \ curl -L https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz -o /tmp/helm.tgz && \ tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \ @@ -19,6 +19,6 @@ RUN apk update && \ EXPOSE 3000 -#USER python +#USER helm-web CMD [ "/usr/bin/python3", "/data/main.py" ] diff --git a/Jenkinsfile b/Jenkinsfile index 1136bf7..5446e3f 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,11 +27,11 @@ spec: stage('Build with Kaniko') { git branch: 'master', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-helm-python.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12.1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine//helm-3:v3.4.2 --destination=harbor.ervine.dev/public/x86_64/alpine//helm-3:v3.13.1' } } stage('Notify gchat') { - hangoutsNotify message: "Helm python flask Application on Alpine Linux 3.12.1 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Helm python flask application on Alpine Linux 3.13.1 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } }