Merge pull request 'Update drone for fun and profit' (#3) from staging into main
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: https://git.voidcorp.nl/j00lz/galerie-site/pulls/3
This commit is contained in:
commit
2b54fdbce5
|
@ -12,6 +12,10 @@ trigger:
|
||||||
- pull_request
|
- pull_request
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: commit hash magic
|
||||||
|
image: bitnami/git:2.33.0
|
||||||
|
commands:
|
||||||
|
- git show -s --format=%H | tee hash
|
||||||
- name: kaniko
|
- name: kaniko
|
||||||
image: plugins/kaniko
|
image: plugins/kaniko
|
||||||
settings:
|
settings:
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
.vscode/
|
.vscode/
|
||||||
dist/
|
dist/
|
||||||
|
hash
|
|
@ -9,6 +9,7 @@ RUN pip install pipenv && pipenv install --system
|
||||||
COPY app.py /app/app.py
|
COPY app.py /app/app.py
|
||||||
COPY templates/ /app/templates
|
COPY templates/ /app/templates
|
||||||
COPY data/ /app/data
|
COPY data/ /app/data
|
||||||
|
COPY hash /app/hash
|
||||||
|
|
||||||
RUN python ./app.py
|
RUN python ./app.py
|
||||||
|
|
||||||
|
|
7
app.py
7
app.py
|
@ -26,11 +26,16 @@ update = date.today()
|
||||||
tijden = render("tijden.md")
|
tijden = render("tijden.md")
|
||||||
nieuws = render("nieuws.md")
|
nieuws = render("nieuws.md")
|
||||||
|
|
||||||
|
def read_hash():
|
||||||
|
with open("hash") as f:
|
||||||
|
line = f.readline()
|
||||||
|
return {"long": line, "short": line[0:7]}
|
||||||
|
|
||||||
inject_now = {'now': date.today().year,
|
inject_now = {'now': date.today().year,
|
||||||
'tijden': tijden,
|
'tijden': tijden,
|
||||||
'nieuws': nieuws,
|
'nieuws': nieuws,
|
||||||
'update': update}
|
'update': update,
|
||||||
|
'hash': read_hash()}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
<hr style="height: 2px;"/>
|
<hr style="height: 2px;"/>
|
||||||
<p style="margin-top: 16px; height: 40px;">Laatste
|
<p style="margin-top: 16px; height: 40px;">Laatste
|
||||||
update: {{ update }}<br/>
|
update: {{ update }}<br/>
|
||||||
|
<a href="https://git.voidcorp.nl/j00lz/galerie-site/commit/{{hash.long}}">Build {{hash.short}}</a><br>
|
||||||
Webmaster: <a href="mailto:webmaster@galerievanslagmaat.nl?SUBJECT=Website Galerie van Slagmaat">Julius de
|
Webmaster: <a href="mailto:webmaster@galerievanslagmaat.nl?SUBJECT=Website Galerie van Slagmaat">Julius de
|
||||||
Jeu</a>
|
Jeu</a>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue