Compare commits

...

11 Commits
master ... dev

Author SHA1 Message Date
Jon Ervine
22546ca6c5 Use master repo 2021-03-08 11:20:38 +08:00
Jonathan Ervine
4f1d64850e Using Alpine Linux 3.13.0 2021-01-20 20:58:46 +08:00
Jonathan Ervine
f1b1445b7f Disable docker cache 2020-11-20 17:36:45 +08:00
Jonathan Ervine
e4872df2a3 Added new versioning 2020-11-20 16:55:04 +08:00
Jonathan Ervine
9b08a8ddca Changed quotes 2020-11-19 11:02:11 +08:00
Jonathan Ervine
1aa9a3a067 Bumped to Alpine 3.12.1 2020-11-19 10:45:39 +08:00
Jonathan Ervine
eb1f4fe0ef Fixed git branch 2020-11-09 14:14:20 +08:00
Jonathan Ervine
41e913a3c2 Fixed upgrade 2020-11-09 11:06:37 +08:00
Jonathan Ervine
f50565c0f8 Fixed label 2020-11-09 11:04:59 +08:00
Jonathan Ervine
08832576cb Fixed image source 2020-11-09 11:01:48 +08:00
Jonathan Ervine
9830b20587 Added dev tags 2020-11-09 10:57:57 +08:00
2 changed files with 9 additions and 9 deletions

View File

@ -1,6 +1,6 @@
# Base on latest (edge) alpine image
FROM harbor.ervine.dev/library/x86_64/alpine:v3.12
LABEL "Maintainer Jonathan Ervine <docker@ervine.org>"
FROM harbor.ervine.dev/public/x86_64/alpine:v3.13
LABEL Maintainer="Jonathan Ervine <docker@ervine.org>"
# Install updates
ENV LANG='en_US.UTF-8' \
@ -8,11 +8,11 @@ ENV LANG='en_US.UTF-8' \
FLASK_APP=/data/app-dev/app.py
RUN apk update && \
apk -U upgrade --ignore aline-baselayout && \
apk -U upgrade --ignore alpine-baselayout && \
apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git && \
adduser -D python
RUN mkdir /data && cd /data && git clone --single-branch --branch dev https://git.ervine.org/jonny/gcp-hockey-results /data
RUN mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/gcp-hockey-results /data
RUN pip3 install -r /data/requirements.txt && \
rm -rf /tmp/src && rm -rf /var/cache/apk/*

10
Jenkinsfile vendored
View File

@ -25,14 +25,14 @@ spec:
node(POD_LABEL) {
stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-hockey.git', credentialsId: 'jenkins-to-git'
git branch: "master", url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-hockey.git', credentialsId: 'jenkins-to-git'
container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/hockey:v3.12.0 --destination=harbor.ervine.dev/public/x86_64/alpine/hockey:v3.12'
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/hockey-dev:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/hockey-dev:v3.13 --destination=harbor.ervine.dev/public/x86_64/alpine/hockey-dev:0.1'
}
}
stage('Notify gchat') {
hangoutsNotify message: "Hockey (dev) Application on Alpine Linux 3.13.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
}
}
}
stage('Notify gchat') {
hangoutsNotify message: "Hockey Application on Alpine Linux 3.12.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
}