Compare commits

...

3 Commits

Author SHA1 Message Date
Jonathan Ervine
b197a23af2 Switched to node builder 2020-07-20 22:25:31 +08:00
Jonathan Ervine
6f2d50163d Using Alpine Linux 3.12 2020-07-09 21:47:29 +08:00
cf558b925d Merge pull request '3.11.6' (#1) from 3.11.6 into master
Reviewed-on: #1
2020-07-09 13:45:34 +00:00
2 changed files with 35 additions and 33 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.12
LABEL maintainer “Jonathan Ervine” <docker@ervine.org> architecture="x86_64" date="17022020" LABEL maintainer “Jonathan Ervine” <docker@ervine.org> architecture="x86_64" date="17022020"
@ -11,13 +11,8 @@ ENV LANG='en_US.UTF-8' \
RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
apk update && \ apk update && \
apk -U upgrade && \ apk -U upgrade --ignore alpine-baselayout && \
apk -U add \ apk -U add python py-lxml py-simplejson openssl py-openssl
python \
py-lxml \
py-simplejson \
openssl \
py-openssl
RUN wget https://github.com/CouchPotato/CouchPotatoServer/archive/$VERSION.tar.gz -O couchpotato.tar.gz && \ RUN wget https://github.com/CouchPotato/CouchPotatoServer/archive/$VERSION.tar.gz -O couchpotato.tar.gz && \
tar zxvf couchpotato.tar.gz && \ tar zxvf couchpotato.tar.gz && \
@ -31,5 +26,4 @@ COPY start.sh /usr/local/bin/start.sh
EXPOSE 5050 EXPOSE 5050
CMD [ "/usr/local/bin/start.sh" ] CMD [ "/usr/local/bin/start.sh" ]

56
Jenkinsfile vendored
View File

@ -1,26 +1,34 @@
node("docker-node") { podTemplate(yaml: """
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { kind: Pod
spec:
git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-cp", credentialsId: 'jenkins-to-git' containers:
- name: kaniko
sh "git rev-parse HEAD > .git/commit-id" image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
def commit_id = readFile('.git/commit-id').trim() imagePullPolicy: Always
println commit_id command:
- /busybox/cat
try { tty: true
stage "build" volumeMounts:
def app = docker.build "library/x86_64/alpine/couchpotato" - name: jenkins-docker-cfg
mountPath: /kaniko/.docker
stage "publish" volumes:
app.push("${env.BUILD_NUMBER}") - name: jenkins-docker-cfg
app.push("latest") projected:
sources:
stage('Deploy on K8s'){ - secret:
sh "/usr/local/bin/kubectl -n media delete po cp-0 && kubectl -n media delete po cp-kids-0" name: regcred
} items:
} - key: .dockerconfigjson
catch (err) { path: config.json
currentBuild.result = 'FAILURE' """
} ) {
node(POD_LABEL) {
stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-cp.git', credentialsId: 'jenkins-to-git'
container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/cp:3.12.0 --destination=harbor.ervine.dev/library/x86_64/alpine/cp:3.12'
}
} }
}
} }