jonny/x86_64-alpine-watcher
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git.ervine.org/jonny/x86_64-alpine-watcher

Browse Source
This commit is contained in:
Jon Ervine 2021-04-01 21:28:12 +08:00
commit 20f35b87b3
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -1,17 +1,14 @@
# Base on latest (edge) alpine image # Base on latest (edge) alpine image
FROM harbor.ervine.dev/library/x86_64/alpine:3.10.5 FROM harbor.ervine.dev/public/x86_64/alpine:v3.10.7
LABEL maintainer="Jonathan Ervine <docker@ervine.org>" LABEL maintainer="Jonathan Ervine docker@ervine.org"
# Install updates # Install updates
# Create mediaservice user # Create mediaservice user
ENV LANG='en_US.UTF-8' \ ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \
BUILD_DATE='29-12-2020' \ BUILD_DATE='29-12-2020' \
TERM='xterm' \ TERM='xterm'
WATCHER_USER=watcher \
WATCHER_UID=1027 \
WATCHER_GID=1027
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 && \
@ -22,12 +19,12 @@ ADD UTC /etc/localtime
RUN git clone https://github.com/barbequesauce/watcher3 && \ RUN git clone https://github.com/barbequesauce/watcher3 && \
rm -rf /var/cache/apk/* && \ rm -rf /var/cache/apk/* && \
addgroup -g $WATCHER_GID $WATCHER_USER && \ addgroup -g 1027 watcher && \
adduser -D -u $WATCHER_UID -G $WATCHER_USER -H $WATCHER_USER && \ adduser -D -u 1027 -G watcher -H watcherR && \
chown -R $WATCHER_UID:$WATCHER_GID /watcher3 chown -R 1027:1027 /watcher3
EXPOSE 9090 EXPOSE 9090
USER $WATCHER_USER USER watcher
CMD [ "/usr/bin/python3", "/watcher3/watcher.py", "--userdata=/config/", "-l /config/logs/" ] CMD [ "/usr/bin/python3", "/watcher3/watcher.py", "--userdata=/config/", "-l /config/logs/" ]

4
Jenkinsfile vendored
View File

@ -3,7 +3,7 @@ kind: Pod
spec: spec:
containers: containers:
- name: kaniko - name: kaniko
image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 image: gcr.io/kaniko-project/executor:debug
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- /busybox/cat - /busybox/cat
@ -27,7 +27,7 @@ spec:
stage('Build with Kaniko') { stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-watcher.git', credentialsId: 'jenkins-to-git' git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-watcher.git', credentialsId: 'jenkins-to-git'
container('kaniko') { container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/watcher:v3.10.5-29122020 --destination=harbor.ervine.dev/public/x86_64/alpine/watcher:v3.10' sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/watcher:v3.10.7'
} }
} }
stage('Notify gchat') { stage('Notify gchat') {