From 77508a984ec23b9a87e5268d9d6cd7816c3bc5f9 Mon Sep 17 00:00:00 2001 From: ahoemann Date: Thu, 20 Mar 2025 18:08:08 +0100 Subject: [PATCH] feat: links defined by environment variables --- .dockerignore | 1 + .gitignore | 2 +- app.py | 2 +- docker-compose.yml | 4 ++-- templates/base.j2 | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index 35f2d33..7dab203 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,5 +2,6 @@ compose.yml *.dockerfile .git* +Jenkinsfile LICENSE README.md diff --git a/.gitignore b/.gitignore index 32ac21b..e2efa92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -.venv +.venv* .env __pycache__ diff --git a/app.py b/app.py index e6f86b0..bd477a3 100755 --- a/app.py +++ b/app.py @@ -18,7 +18,7 @@ def about(): @app.route("/") def homepage(): - return render_template("homepage.j2") + return render_template("homepage.j2", MONITORING_URL = os.environ['MONITORING_URL'], GIT_URL = os.environ['GIT_URL']) if __name__ == "__main__": diff --git a/docker-compose.yml b/docker-compose.yml index 731ba82..01e34a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,12 @@ services: build: context: "." - dockerfile: "latest.dockerfile" + dockerfile: "Dockerfile" container_name: "adrianux" image: "adrianux:latest" environment: - "GIT_URL=http://git.adrianux.net" - - "WEBSITE_URL=http://adrianux.net" + - "MONITORING_URL=http://adrianux.net" - "DEBUG_MODE=False" ports: - "127.0.0.1:8080:8080" diff --git a/templates/base.j2 b/templates/base.j2 index 11e99ce..2ac8dd6 100644 --- a/templates/base.j2 +++ b/templates/base.j2 @@ -14,8 +14,8 @@
  • Homepage
  • Imprint
  • About
    • -
  • Monitoring
    • -
  • Git
    • +
  • Monitoring
    • +
  • Git