Merge pull request 'issue-#2' (#6) from issue-#2 into master

Reviewed-on: #6
This commit is contained in:
Jonny Ervine 2020-12-18 06:14:57 +00:00
commit a7df40eb77
4 changed files with 12 additions and 8 deletions

View File

@ -6,16 +6,14 @@ LABEL MAINTAINER="Jonathan Ervine <jonathan.ervine@gogox.com>"
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \
FLASK_APP=/data/app-dev/app.py \
VERSION=1.1.4
VERSION=1.1.5
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 python && \
mkdir /data && cd /data && git clone --single-branch --branch master https://github.com/jervine-gogo/python-helm-web /data && \
mkdir /data && cd /data && git clone --single-branch --branch issue-#2 https://github.com/jervine-gogo/python-helm-web /data && \
pip3 install -r /data/requirements.txt && \
curl -L "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" -o /usr/local/bin/kubectl && \
chmod 755 /usr/local/bin/kubectl && \
curl -L https://get.helm.sh/helm-v2.13.1-linux-amd64.tar.gz -o /tmp/helm-2.13.1.tgz && \
tar -zxvf /tmp/helm-2.13.1.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \
rm -rf /tmp/src && rm -rf /var/cache/apk/*

View File

@ -23,4 +23,6 @@
{{ table }}
</table>
<a class="btn btn-primary" href="/" role="button">Home</a>
<br>
<a class="btn btn-primary" href="/oauth2/sign_out" role="button">Log Off</a>
</body>

View File

@ -43,6 +43,8 @@
{{ form.submitButton(class_="btn btn-success") }}
<a class="btn btn-danger" href="/" role="button">Cancel</a>
</p>
<br>
<a class="btn btn-primary" href="/oauth2/sign_out" role="button">Log Off</a>
</form>
</div>
</div>

View File

@ -32,6 +32,8 @@
<p>
{{ form.submitButton(class_="btn btn-success") }}
<a class="btn btn-danger" href="/" role="button">Cancel</a>
<br>
<a class="btn btn-primary" href="/oauth2/sign_out" role="button">Log Off</a>
</p>
</form>
</div>