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

Compare commits

merge into: jonny:dev
Branches Tags
jonny:master
jonny:dev
...
pull from: jonny:master
Branches Tags
jonny:master
jonny:dev

25 Commits
dev ... master

Author SHA1 Message Date
jonny
5d2d10e34d 'update files with ansible' 2022-01-30 11:26:48 +00:00
jonny
fcaed0c346 'update files with ansible' 2021-10-11 13:16:29 +00:00
jonny
ef08a26472 'update files with ansible' 2021-09-19 14:50:14 +00:00
jonny
874fb9a40f 'update files with ansible' 2021-09-19 14:36:36 +00:00
jonny
6faef3f4a3 'update files with ansible' 2021-09-19 14:15:04 +00:00
jonny
268b75de8b 'update files with ansible' 2021-09-19 13:55:22 +00:00
jonny
70be9421e0 'update files with ansible' 2021-09-11 08:05:23 +00:00
jonny
bc0968b3bb 'update files with ansible' 2021-05-17 13:38:47 +00:00
jonny
4e1f723167 'update files with ansible' 2021-03-31 03:37:01 +00:00
jonny
53a8f8428e 'update files with ansible' 2021-03-30 12:31:42 +00:00
jonny
1f7bc84f67 'update files with ansible' 2021-03-11 13:03:17 +00:00
jonny
e799275596 'update files with ansible' 2021-03-11 13:00:10 +00:00
jonny
836fba91c8 'update files with ansible' 2021-03-11 12:53:37 +00:00
Jon Ervine
952bf7d6e3 Bumped alpine version 2021-03-08 11:26:41 +08:00
Jonny Ervine
ffcb1a2233 Update 'Dockerfile' 2020-11-20 08:43:58 +00:00
Jonny Ervine
542ed54410 Update 'Jenkinsfile' 2020-11-20 08:43:37 +00:00
Jonathan Ervine
9ab54c69cb Use dev image name 2020-11-20 16:42:48 +08:00
Jonathan Ervine
ff85054569 Switch to dev branch 2020-11-20 16:36:17 +08:00
Jonathan Ervine
db136a098c Switch to dev branch for dev builds 2020-11-20 15:11:39 +08:00
Jonathan Ervine
6d372e6eae Bring up to data 2020-11-20 14:01:41 +08:00
Jonathan Ervine
6a76d53ee8 Add comma 2020-11-19 11:03:31 +08:00
Jonathan Ervine
8d1a740574 Fixed git branch 2020-11-09 14:13:57 +08:00
Jonathan Ervine
7011796419 Fixed dockerfile 2020-11-09 11:08:16 +08:00
Jonathan Ervine
777a9d8c00 Fixed upstream image name 2020-11-09 11:02:24 +08:00
Jonathan Ervine
1a136893cc Switched to use master branch of code 2020-11-09 10:42:12 +08:00
2 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

12
Dockerfile
View File

@ -1,6 +1,6 @@
# Base on latest (edge) alpine image # Base on latest (edge) alpine image
FROM harbor.ervine.dev/library/x86_64/alpine:v3.12 FROM harbor.ervine.dev/public/x86_64/alpine:v3.15.0
LABEL "Maintainer Jonathan Ervine <docker@ervine.org>" LABEL Maintainer="Jonathan Ervine docker@ervine.org"
# Install updates # Install updates
ENV LANG='en_US.UTF-8' \ ENV LANG='en_US.UTF-8' \
@ -8,17 +8,17 @@ ENV LANG='en_US.UTF-8' \
FLASK_APP=/data/app-dev/app.py FLASK_APP=/data/app-dev/app.py
RUN apk update && \ 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 && \ apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git && \
adduser -D python adduser -D hockey
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.git /data
RUN pip3 install -r /data/requirements.txt && \ RUN pip3 install -r /data/requirements.txt && \
rm -rf /tmp/src && rm -rf /var/cache/apk/* rm -rf /tmp/src && rm -rf /var/cache/apk/*
EXPOSE 3000 EXPOSE 3000
#USER python #USER hockey
CMD [ "/usr/bin/python3", "/data/main.py" ] CMD [ "/usr/bin/python3", "/data/main.py" ]

13
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
@ -25,14 +25,13 @@ spec:
node(POD_LABEL) { node(POD_LABEL) {
stage('Build with Kaniko') { 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') { 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:v1.0.6'
} }
} }
stage('Notify gchat') {
hangoutsNotify message: "Hockey Application on Alpine Linux 3.15.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
}