Switched to node builder

This commit is contained in:
Jonathan Ervine 2020-07-21 22:31:06 +08:00
parent 7f15e9d076
commit 5ddec20d0b
3 changed files with 44 additions and 26 deletions

View File

@ -1,22 +1,17 @@
# 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
MAINTAINER “Jonathan Ervine” <docker@ervine.org>
# Install updates
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \
TERM='xterm' \
ZNC_USER='znc' \
ZNC_GROUP='znc' \
ZNC_UID='1003' \
ZNC_GID='1003'
TERM='xterm'
RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
apk update && \
apk -U upgrade && \
apk -U add \
znc
apk -U upgrade --ignore base-layout && \
apk -U add znc
ADD UTC /etc/localtime
@ -26,6 +21,4 @@ EXPOSE 6667 8080
VOLUME /config
USER $ZNC_USER
CMD [ "/usr/bin/znc", "-d", "/config/", "-f" ]

48
Jenkinsfile vendored
View File

@ -1,17 +1,35 @@
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-znc", credentialsId: 'jenkins-to-git'
sh "git rev-parse HEAD > .git/commit-id"
def commit_id = readFile('.git/commit-id').trim()
println commit_id
stage "build"
def app = docker.build "library/x86_64/alpine/znc"
stage "publish"
app.push("${env.BUILD_NUMBER}")
app.push("latest")
podTemplate(yaml: """
kind: Pod
spec:
containers:
- name: kaniko
image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
imagePullPolicy: Always
command:
- /busybox/cat
tty: true
volumeMounts:
- name: jenkins-docker-cfg
mountPath: /kaniko/.docker
volumes:
- name: jenkins-docker-cfg
projected:
sources:
- secret:
name: regcred
items:
- key: .dockerconfigjson
path: config.json
"""
) {
node(POD_LABEL) {
stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-znc.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/znc:3.12'
}
}
}
}

7
start.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
#
## Script to kick off ZNC
#
addgroup -g $GID $USER
adduser -D -u $UID -G $USER -H $USER
su - $USER -c "/usr/bin/znc -d /config -f"