Merge pull request '3.10.5' (#1) from 3.10.5 into master

Reviewed-on: #1
This commit is contained in:
Jonny Ervine 2020-07-15 08:20:22 +00:00
commit a9c3016a98
3 changed files with 61 additions and 0 deletions

35
Dockerfile Normal file
View File

@ -0,0 +1,35 @@
# Base on latest (edge) alpine image
FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.10
MAINTAINER “Jonathan Ervine” <docker@ervine.org>
# Install updates
# Create mediaservice user
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \
BUILD_DATE='06-04-2020' \
TERM='xterm' \
HTPC_USER='mediaservice' \
HTPC_GROUP='mediaservice' \
HTPC_UID='1003' \
HTPC_GID='1003'
RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
apk update && \
apk -U upgrade && \
apk -U add \
python3 git
ADD UTC /etc/localtime
RUN git clone https://github.com/barbequesauce/watcher3 && \
rm -rf /var/cache/apk/* && \
addgroup -g $HTPC_GID $HTPC_GROUP && \
adduser -D -u $HTPC_UID -G $HTPC_GROUP -H $HTPC_USER && \
chown -R $HTPC_USER:$HTPC_GROUP /watcher3
EXPOSE 9090
USER $HTPC_USER
CMD [ "/usr/bin/python3", "/watcher3/watcher.py", "--userdata=/config/" ]

26
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,26 @@
node("docker-node") {
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') {
git branch: "3.10.5", url: "ssh://git@git.ervine.org/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()
println commit_id
try {
stage "build"
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) {
currentBuild.result = 'FAILURE'
}
}
}

BIN
UTC Normal file

Binary file not shown.