diff --git a/Dockerfile b/Dockerfile index cb9d2a4..68cdd32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11 +FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.10 MAINTAINER “Jonathan Ervine” diff --git a/Jenkinsfile b/Jenkinsfile index dcbcd87..f7c267f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ node("docker-node") { 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-watcher", credentialsId: 'jenkins-to-git' + git branch: "3.10.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-watcher", credentialsId: 'jenkins-to-git' sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim() @@ -9,14 +9,12 @@ node("docker-node") { try { stage "build" - def app = docker.build "library/x86_64/alpine/watcher" + def app = docker.build "library/x86_64/alpine-3.10/watcher" stage "publish" app.push("${env.BUILD_NUMBER}") app.push("latest") - stage('Deploy on k8s'){ - sh "/usr/local/bin/kubectl -n media delete po watcher-0" } } catch (err) {