modified: Dockerfile

modified:   Jenkinsfile
Created 3.10.3 branch
This commit is contained in:
Jonny Ervine 2020-02-28 09:54:27 +00:00
parent 4ee1b8e139
commit 30d56c327d
2 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,5 @@
# Base on latest (edge) alpine image # 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” <docker@ervine.org> MAINTAINER “Jonathan Ervine” <docker@ervine.org>

6
Jenkinsfile vendored
View File

@ -1,7 +1,7 @@
node("docker-node") { node("docker-node") {
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { 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" sh "git rev-parse HEAD > .git/commit-id"
def commit_id = readFile('.git/commit-id').trim() def commit_id = readFile('.git/commit-id').trim()
@ -9,14 +9,12 @@ node("docker-node") {
try { try {
stage "build" stage "build"
def app = docker.build "library/x86_64/alpine/watcher" def app = docker.build "library/x86_64/alpine-3.10/watcher"
stage "publish" stage "publish"
app.push("${env.BUILD_NUMBER}") app.push("${env.BUILD_NUMBER}")
app.push("latest") app.push("latest")
stage('Deploy on k8s'){
sh "/usr/local/bin/kubectl -n media delete po watcher-0"
} }
} }
catch (err) { catch (err) {