Initial commit

Author: robin-rpr

.github/workflows/main.yml

@@ -2,14 +2,12 @@ name: Main
 
 on:
   push:
-    branches:
-      - main
     tags:
-      - '*'  # Triggers both builds and tag deployments
+      - '*'
 
 jobs:
   build:
-    name: Build and Test
+    name: Build
     runs-on: ubuntu-latest
 
     steps:
@@ -34,60 +32,12 @@ jobs:
       - name: Create Docker Buildx builder
         run: docker buildx create --use --name mybuilder
 
-      - name: Generate Docker Compose file
-        run: |
-          pip install jinja2-cli[yaml]
-          jinja2 docker-compose.jinja values.yaml -D version=${{ env.VERSION }} -D production=true > docker-compose.yml
-
       - name: Build and push image
-        if: startsWith(github.ref, 'refs/tags/')
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/bgpdata:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/bgpdata:${{ env.VERSION }}
-          platforms: linux/amd64
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: docker-compose.yml
-          path: docker-compose.yml
-
-  deploy:
-    name: Deploy to GitHub Pages
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Git user
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Checkout gh-pages branch
-        run: |
-          git fetch --no-tags --filter=blob:none origin gh-pages
-          git checkout gh-pages || git checkout --orphan gh-pages
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: docker-compose.yml
-          path: .
-
-      - name: Commit and Push Changes
-        run: |
-          git add docker-compose.yml
-          git commit -m "Deploy latest docker-compose.yml to GitHub Pages"
-          git push origin gh-pages || echo "No changes to push"
+            ${{ secrets.DOCKERHUB_USERNAME }}/web:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/web:${{ env.VERSION }}
+          platforms: linux/amd64

app.py

@@ -1,7 +1,7 @@
 from flask import Flask, render_template, request, redirect, url_for, abort, session, current_app as app, jsonify
 from utils.text import time_ago, format_text, clean_text, alphanumeric_text, clean_text, sanitize_text, date_text
 from flask_compress import Compress
-from config import MainConfig as Config
+from config import Config
 from flask_cors import CORS
 from flask_talisman import Talisman
 from utils.socket import sock, WebSocketBroadcaster

config.py

@@ -1,10 +1,6 @@
 import os
 
-class BaseConfig:
-    ENVIRONMENT = os.getenv('ENVIRONMENT', 'development').lower()
-    LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO' if ENVIRONMENT == 'production' else 'DEBUG').upper()
-
-class MainConfig(BaseConfig):
+class Config():
     # Flask
     FLASK_HOST = os.getenv('FLASK_HOST')
     SECRET_KEY = os.getenv('SECRET_KEY')
@@ -18,34 +14,23 @@ class MainConfig(BaseConfig):
 
     # Postmark
     POSTMARK_API_KEY = os.getenv('POSTMARK_API_KEY')
+    
+    # Environment
+    ENVIRONMENT = os.getenv('ENVIRONMENT', 'development').lower()
+    LOG_LEVEL = os.getenv('LOG_LEVEL', 'INFO' if ENVIRONMENT == 'production' else 'DEBUG').upper()
 
     @staticmethod
     def validate():
         required = {
-            'ENVIRONMENT': MainConfig.ENVIRONMENT,
-            'SECRET_KEY': MainConfig.SECRET_KEY,
-            'FLASK_HOST': MainConfig.FLASK_HOST,
-            'POSTMARK_API_KEY': MainConfig.POSTMARK_API_KEY,
-            'POSTGRES_HOST': MainConfig.POSTGRES_HOST,
-            'POSTGRES_PORT': MainConfig.POSTGRES_PORT,
-            'POSTGRES_DB': MainConfig.POSTGRES_DB,
-            'POSTGRES_USER': MainConfig.POSTGRES_USER,
-            'POSTGRES_PASSWORD': MainConfig.POSTGRES_PASSWORD,
-        }
-        for key, val in required.items():
-            if not val:
-                raise ValueError(f"{key} is not set")
-
-
-class RelayConfig(BaseConfig):
-    HOST = os.getenv('HOST')
-    OPENBMP_CONNECT = os.getenv('OPENBMP_CONNECT')
-
-    @staticmethod
-    def validate():
-        required = {
-            'HOST': RelayConfig.HOST,
-            'OPENBMP_CONNECT': RelayConfig.OPENBMP_CONNECT,
+            'ENVIRONMENT': Config.ENVIRONMENT,
+            'SECRET_KEY': Config.SECRET_KEY,
+            'FLASK_HOST': Config.FLASK_HOST,
+            'POSTMARK_API_KEY': Config.POSTMARK_API_KEY,
+            'POSTGRES_HOST': Config.POSTGRES_HOST,
+            'POSTGRES_PORT': Config.POSTGRES_PORT,
+            'POSTGRES_DB': Config.POSTGRES_DB,
+            'POSTGRES_USER': Config.POSTGRES_USER,
+            'POSTGRES_PASSWORD': Config.POSTGRES_PASSWORD,
         }
         for key, val in required.items():
             if not val: