diff --git a/README.md b/README.md index d8bec04..7cf7903 100644 --- a/README.md +++ b/README.md @@ -3,28 +3,41 @@ ## Setting up the environment 1. Create a virtual environment: + ```sh python3 -m venv .venv ``` 2. Activate the virtual environment: + ```sh . .venv/bin/activate ``` 3. Install dependencies: + ```sh pip install requirements.txt ``` 4. Set the environment variables: + ```sh -export GIT_URL=http://git.adrianux.net -export WEBSITE_URL=http://adrianux.net export DEBUGMODE=False ``` +Or source the .env file: + +```sh +cp .env.example .env # change the variables to suit your environment as needed +``` + +```sh +. .env +``` + 5. Run the app: + ```sh waitress-serve --listen=0.0.0.0:8080 app:app ``` @@ -34,10 +47,9 @@ waitress-serve --listen=0.0.0.0:8080 app:app ## Building the container ```sh -docker build -t adrianux:latest - < latest.dockerfile +docker build -t adrianux:latest . ``` - ## Running the container ```sh diff --git a/app.py b/app.py index bd477a3..5837049 100755 --- a/app.py +++ b/app.py @@ -1,9 +1,6 @@ #!/usr/bin/env python3 from flask import Flask, render_template, redirect, url_for -from concurrent.futures import ThreadPoolExecutor -import requests import os -import time app = Flask(__name__) @@ -18,10 +15,12 @@ def about(): @app.route("/") def homepage(): - return render_template("homepage.j2", MONITORING_URL = os.environ['MONITORING_URL'], GIT_URL = os.environ['GIT_URL']) + return render_template("homepage.j2") if __name__ == "__main__": + GIT_URL = os.environ['GIT_URL'] + MONITORING_URL = os.environ['MONITORING_URL'] app.run(debug=os.environ['DEBUG_MODE']) diff --git a/docker-compose.yml b/docker-compose.yml index 01e34a4..9241790 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,6 @@ dockerfile: "Dockerfile" container_name: "adrianux" image: "adrianux:latest" - environment: - - "GIT_URL=http://git.adrianux.net" - - "MONITORING_URL=http://adrianux.net" - - "DEBUG_MODE=False" + env_file: .env ports: - "127.0.0.1:8080:8080" diff --git a/templates/base.j2 b/templates/base.j2 index 2ac8dd6..a043f1b 100644 --- a/templates/base.j2 +++ b/templates/base.j2 @@ -14,8 +14,8 @@
  • Homepage
  • Imprint
  • About
    • -
  • Monitoring
    • -
  • Git
    • +
  • Monitoring
    • +
  • Git