Compare commits

..

2 Commits

Author SHA1 Message Date
Jon Ervine
8a07c53327 Added chart 2021-03-31 21:34:52 +08:00
Jonathan Ervine
a2de198fa4 Using Alpine Linux 3.13.0 2021-01-20 20:57:39 +08:00
11 changed files with 12 additions and 12 deletions

View File

@ -1,6 +1,6 @@
# Base on latest (edge) alpine image
FROM harbor.ervine.dev/public/x86_64/alpine:v3.15.0
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' \
@ -10,15 +10,15 @@ ENV LANG='en_US.UTF-8' \
RUN apk update && \
apk -U upgrade --ignore alpine-baselayout && \
apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git curl && \
adduser -D helm-web && \
mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/flask-python-helm.git /data && \
adduser -D python && \
mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/flask-python-helm /data && \
pip3 install -r /data/requirements.txt && \
curl -L https://get.helm.sh/helm-v3.7.1-linux-amd64.tar.gz -o /tmp/helm.tgz && \
curl -L https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz -o /tmp/helm.tgz && \
tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \
rm -rf /tmp/src && rm -rf /var/cache/apk/*
EXPOSE 3000
#USER helm-web
#USER python
CMD [ "/usr/bin/python3", "/data/main.py" ]

6
Jenkinsfile vendored
View File

@ -3,7 +3,7 @@ kind: Pod
spec:
containers:
- name: kaniko
image: gcr.io/kaniko-project/executor:debug
image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
imagePullPolicy: Always
command:
- /busybox/cat
@ -27,11 +27,11 @@ spec:
stage('Build with Kaniko') {
git branch: 'master', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-helm-python.git', credentialsId: 'jenkins-to-git'
container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.7.1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.15.0'
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.13'
}
}
stage('Notify gchat') {
hangoutsNotify message: "Helm python flask application on Alpine Linux 3.15.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
hangoutsNotify message: "Helm python flask Application on Alpine Linux 3.13.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
}
}
}

View File

@ -1,6 +1,6 @@
apiVersion: v2
name: helm-web
description: A Helm chart for the helm-web application
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.1
version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 0.1
appVersion: 0.10