Feature/update deployment (#60)

daniel-mizsak · web-flow · commit 149112c65788 · 2024-09-21T22:17:08.000+02:00
* Remove old deployment files

* Add docker deployment
diff --git a/.cpanel.yml b/.cpanel.yml
diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml
@@ -0,0 +1,31 @@
+---
+  name: GHCR
+  on:
+    push:
+      tags:
+        - 'v*'
+    workflow_dispatch:
+
+  jobs:
+    ghcr:
+      runs-on: ubuntu-latest
+      permissions:
+        packages: write
+
+      steps:
+        - name: Check out the codebase.
+          uses: actions/checkout@v4
+
+        - name: Login to ghcr.
+          uses: docker/login-action@v3
+          with:
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+
+        - name: Build and push image.
+          uses: docker/build-push-action@v6
+          with:
+            context: docker/
+            push: true
+            tags: ghcr.io/PythonVilag/pythonvilag-website:latest
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # Project
+secret_key.txt
 src/pythonvilag_website/static/uploads/*
 
 # System
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,19 @@
+# Set basic image data
+FROM python:3.12-slim
+LABEL org.opencontainers.image.source="https://github.com/PythonVilag/pythonvilag-website"
+
+ENV LANG=C.UTF-8
+ENV TZ=Europe/Copenhagen
+
+# Copy files
+WORKDIR /workspace
+COPY ./requirements.txt ./requirements.txt
+COPY ./src/ ./src/
+
+# Install python packages
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt
+
+# Run command
+EXPOSE 5000
+CMD ["python", "src/run.py", "--port", "5000"]
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
@@ -14,10 +14,3 @@ Source code that powers the <a href="https://pythonvilag.hu/" target="_blank">Py
 
 ## Deployment
 Currently I am hosting this website on [mikrovps](https://www.mikrovps.net/hu).
-
-Previously I was experimenting with hosting on [digitalocean](https://www.digitalocean.com/).\
-The following link can be used to deploy the website and to use my referral code. (Keep in mind that during the deployment some environment variables need to be set.)
-
-<a href="https://cloud.digitalocean.com/apps/new?repo=https://github.com/PythonVilag/pythonvilag-website/tree/main&refcode=f2cb42a82894" target="_blank">
- <img src="https://www.deploytodo.com/do-btn-white.svg" alt="deploy">
-</a>
diff --git a/compose.yml b/compose.yml
@@ -0,0 +1,16 @@
+---
+services:
+  pythonvilag-website:
+    image: ghcr.io/PythonVilag/pythonvilag-website:latest
+    container_name: pythonvilag-website
+    hostname: pythonvilag-website
+    ports:
+      - "5000:5000"
+    environment:
+      - SECRET_KEY=/run/secrets/secret_key
+    secrets:
+      - secret_key
+
+secrets:
+  secret_key:
+    file: secret_key.txt
diff --git a/gunicorn_config.py b/gunicorn_config.py
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,11 @@
-.
+Flask-SQLAlchemy==3.1.1
+Flask-WTF==1.2.1
+Flask==3.0.3
+gunicorn==23.0.0
+itsdangerous==2.2.0
+python-dotenv==1.0.1
+SQLAlchemy==2.0.32
+Werkzeug==3.0.3
+# Self maintained
+# private-lecture-automation==0.2.0
+# checkmark==0.1.0
diff --git a/src/pythonvilag_website/__init__.py b/src/pythonvilag_website/__init__.py
@@ -15,18 +15,17 @@
 config = dotenv_values(".env")
 if not config:
     config = dict(os.environ)
-try:
-    FLASK_DEBUG = str(config["FLASK_DEBUG"]) == "True"
-    SECRET_KEY = str(config["PV_SECRET_KEY"])
-    if not SECRET_KEY:
-        error_message = "PV_SECRET_KEY is empty. Did you update the environment variables?"
-        raise ValueError(error_message)
-
-    PRIVATE_LECTURE_AUTOMATION = str(config["PRIVATE_LECTURE_AUTOMATION"]) == "True"
-    CHECKMARK = str(config["CHECKMARK"]) == "True"
-except KeyError as e:
-    error_message = "Config variables are missing. Check .env file or add environment variables."
-    raise KeyError(error_message) from e
+
+SECRET_KEY = config.get("SECRET_KEY")
+if not SECRET_KEY:
+    error_message = "SECRET_KEY config variable is missing. Check .env file or add environment variables."
+    raise ValueError(error_message)
+else:
+    SECRET_KEY = str(SECRET_KEY)
+
+FLASK_DEBUG = str(config.get("FLASK_DEBUG")) == "True"
+PRIVATE_LECTURE_AUTOMATION = str(config.get("PRIVATE_LECTURE_AUTOMATION")) == "True"
+CHECKMARK = str(config.get("CHECKMARK")) == "True"
 
 # Create the app
 app = Flask(__name__)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+
 from pythonvilag_website import app
 
 
diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,7 @@ python =
 
 [testenv]
 setenv =
-    PV_SECRET_KEY = {env:PV_SECRET_KEY:SECRET}
+    SECRET_KEY = {env:SECRET_KEY:SECRET}
     FLASK_DEBUG = {env:FLASK_DEBUG:False}
     PRIVATE_LECTURE_AUTOMATION = {env:PRIVATE_LECTURE_AUTOMATION:False}
     CHECKMARK = {env:CHECKMARK:False}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Project`
	`2`	`+secret_key.txt`
`2`	`3`	`src/pythonvilag_website/static/uploads/*`
`3`	`4`
`4`	`5`	`# System`