From 5960197d1df8d3030ac66dbbed768f0422d4a934 Mon Sep 17 00:00:00 2001 From: jonny Date: Thu, 11 Mar 2021 13:13:48 +0000 Subject: [PATCH] 'update files with ansible' --- Dockerfile | 8 +++----- Jenkinsfile | 13 ++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index de3aa31..3b55c7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.13 +FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.1 -LABEL "Maintainer Jonathan Ervine " +LABEL "Maintainer Jonathan Ervine docker@ervine.org" # Install updates -# Create mediaservice user ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' @@ -12,8 +11,7 @@ ENV LANG='en_US.UTF-8' \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk update && \ apk upgrade --ignore alpine-baselayout && \ - apk -U add \ - python2 git py-pillow + apk -U add python2 git py-pillow ADD UTC /etc/localtime diff --git a/Jenkinsfile b/Jenkinsfile index bf7c415..727d0c2 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 @@ -25,14 +25,13 @@ spec: node(POD_LABEL) { stage('Build with Kaniko') { - git 'https://git.ervine.org/jonny/x86_64-alpine-htpcmgr.git' + git branch: 'master', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-htpcmgr.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/htpc-mgr:latest --destination=harbor.ervine.dev/public/x86_64/alpine/htpc-mgr:2019' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine//htpcmgr:v3.13.1' } } + stage('Notify gchat') { + hangoutsNotify message: "Alpine Linux 3.13.1 with HTPC Manager has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + } } } - -stage('Notify gchat') { - hangoutsNotify message: "Alpine Linux 3.13.0 with HTPC Manager has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false -}