Merge pull request #178 from Zeecka/feature/merge_prod

Merging main and prod into a single branch
2026-01-18 14:43:12 +01:00
parent 1955e3fdd4 6794744dbf
commit ee1030a508
6 changed files with 41 additions and 70 deletions
@@ -2,7 +2,7 @@
 WEB_APP_PORT=5000

 # Application configuration
-PROJECT_VERSION=3.1.2
+PROJECT_VERSION=3.1.3
 MAX_CONTENT_LENGTH=3145728
 MAX_PENDING_TIME=600
 MAX_STORE_TIME=259200
@@ -10,6 +10,9 @@ CLEAR_AT_RESTART=1
 SKIP_IHDR_FILL=0
 REMOVAL_MIN_AGE_SECONDS=300

+GOOGLE_ADS_TXT="google.com, pub-2324718887045017, DIRECT, f08c47fec0942fa0"
+CUSTOM_EXTERNAL_SCRIPT="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-2324718887045017"
+
 # Flask configuration
 FLASK_DEBUG=0

@@ -13,17 +13,6 @@ jobs:
    - name: Get release version
      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV

-    - name: Determine tag type (prod vs main)
-      id: tag_type
-      run: |
-        if [[ "${{ env.RELEASE_VERSION }}" == *"-prod"* ]]; then
-          echo "is_prod_tag=true" >> $GITHUB_OUTPUT
-          echo "📦 Prod tag detected - will push :latest-prod"
-        else
-          echo "is_prod_tag=false" >> $GITHUB_OUTPUT
-          echo "📦 Main tag detected - will push :latest"
-        fi
-
    - name: Checkout
      uses: actions/checkout@v4

@@ -40,20 +29,8 @@ jobs:
        username: ${{ github.actor }}
        password: ${{ secrets.GITHUB_TOKEN }}

-    # Build and push for PROD tags (X.X.X-prod)
-    - name: Build and push Docker images (prod)
-      if: steps.tag_type.outputs.is_prod_tag == 'true'
-      uses: docker/build-push-action@v6.9.0
-      with:
-        context: ./
-        push: true
-        tags: |
-          ghcr.io/zeecka/aperisolve:${{ env.RELEASE_VERSION }}
-          ghcr.io/zeecka/aperisolve:prod
-
    # Build and push for MAIN tags (X.X.X)
-    - name: Build and push Docker images (main)
-      if: steps.tag_type.outputs.is_prod_tag == 'false'
+    - name: Build and push Docker images
      uses: docker/build-push-action@v6.9.0
      with:
        context: ./
@@ -73,39 +50,6 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Check if tag is from prod branch
-        id: check
-        run: |
-          TAG_REF="${GITHUB_REF#refs/tags/}"
-          echo "Tag: $TAG_REF"
-          echo "Commit SHA: $GITHUB_SHA"
-
-          # Get branches containing this commit
-          BRANCHES=$(git branch -r --contains HEAD)
-          echo "Branches containing this commit: $BRANCHES"
-
-          # Check if commit is on prod branch
-          if echo "$BRANCHES" | grep -q "origin/prod"; then
-            # Additional check: ensure this commit is at the HEAD of prod
-            # This prevents deployment if the same commit exists on multiple branches
-            PROD_HEAD=$(git rev-parse origin/prod)
-            TAG_COMMIT=$(git rev-parse HEAD)
-
-            echo "Prod HEAD: $PROD_HEAD"
-            echo "Tag commit: $TAG_COMMIT"
-
-            if [ "$PROD_HEAD" = "$TAG_COMMIT" ]; then
-              echo "is_prod=true" >> $GITHUB_OUTPUT
-              echo "✅ Tag is at prod branch HEAD - will deploy"
-            else
-              echo "is_prod=false" >> $GITHUB_OUTPUT
-              echo "⚠️ Commit is on prod but not at HEAD - skipping deployment"
-            fi
-          else
-            echo "is_prod=false" >> $GITHUB_OUTPUT
-            echo "❌ Tag is not from prod branch - skipping deployment"
-          fi
-
      # wait for 120 seconds
      - name: Wait for image propagation
        if: steps.check.outputs.is_prod == 'true'
@@ -114,7 +58,6 @@ jobs:
          sleep 120

      - name: Deploy to production server
-        if: steps.check.outputs.is_prod == 'true'
        uses: appleboy/ssh-action@v1.0.3
        with:
          host: ${{ secrets.PROD_SSH_HOST }}
@@ -138,6 +81,9 @@ jobs:
            SKIP_IHDR_FILL=${{ vars.SKIP_IHDR_FILL }}
            REMOVAL_MIN_AGE_SECONDS=${{ vars.REMOVAL_MIN_AGE_SECONDS }}

+            GOOGLE_ADS_TXT=${{ vars.GOOGLE_ADS_TXT }}
+            CUSTOM_EXTERNAL_SCRIPT=${{ vars.CUSTOM_EXTERNAL_SCRIPT }}
+
            FLASK_DEBUG=${{ vars.FLASK_DEBUG }}

            RQ_DASHBOARD_REDIS_URL=${{ vars.RQ_DASHBOARD_REDIS_URL }}
@@ -5,7 +5,6 @@

 import hashlib
 import json
-import os
 import shutil
 import time
 from datetime import datetime, timezone
@@ -22,7 +21,13 @@ from .utils.sentry import initialize_sentry
 initialize_sentry()

 from .config import (
+    CUSTOM_EXTERNAL_SCRIPT,
+    DB_URI,
+    FLASK_DEBUG,
+    GOOGLE_ADS_TXT,
    IMAGE_EXTENSIONS,
+    MAX_CONTENT_LENGTH,
+    PROJECT_VERSION,
    REMOVAL_MIN_AGE_SECONDS,
    REMOVED_IMAGES_FOLDER,
    RESULT_FOLDER,
@@ -35,10 +40,11 @@ def create_app() -> Flask:
    """Create flask application with routes."""
    app = Flask(__name__)
    app.json.sort_keys = False  # type: ignore
-    app.config["SQLALCHEMY_DATABASE_URI"] = os.environ.get("DB_URI")
-    app.config["PROJECT_VERSION"] = os.getenv("PROJECT_VERSION")
+    app.config["PROJECT_VERSION"] = PROJECT_VERSION
+    app.config["CUSTOM_EXTERNAL_SCRIPT"] = CUSTOM_EXTERNAL_SCRIPT
+    app.config["SQLALCHEMY_DATABASE_URI"] = DB_URI
    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
-    app.config["MAX_CONTENT_LENGTH"] = int(os.environ.get("MAX_CONTENT_LENGTH", 1024 * 1024))
+    app.config["MAX_CONTENT_LENGTH"] = MAX_CONTENT_LENGTH
    app.config["REDIS_QUEUE"] = Queue(connection=Redis(host="redis", port=6379))
    db.init_app(app)

@@ -433,10 +439,14 @@ def create_app() -> Flask:

        return send_file(output_file, as_attachment=True)

+    @app.route("/ads.txt")
+    def google_ads() -> str:
+        """Google Ads required file"""
+        return GOOGLE_ADS_TXT
+
    return app


 if __name__ == "__main__":
    my_app = create_app()
-    debug_mode = os.environ.get("FLASK_DEBUG", "0") == "1"
-    my_app.run(host="0.0.0.0", port=5000, debug=debug_mode)
+    my_app.run(host="0.0.0.0", port=5000, debug=FLASK_DEBUG)
@@ -6,12 +6,23 @@
 from os import getenv
 from pathlib import Path

-IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".gif", ".bmp", ".webp", ".tiff"]
-WORKER_FILES = ["binwalk", "foremost", "steghide", "zsteg", "openstego", "pcrt", "jpseek"]
+PROJECT_VERSION = getenv("PROJECT_VERSION", "development")

-RESULT_FOLDER = Path(__file__).parent.resolve() / "results"
-REMOVED_IMAGES_FOLDER = Path(__file__).parent.resolve() / "removed_images"
 REMOVAL_MIN_AGE_SECONDS = int(getenv("REMOVAL_MIN_AGE_SECONDS", "300"))  # 5 minutes
 MAX_PENDING_TIME = int(getenv("MAX_PENDING_TIME", "600"))  # 10 minutes by default
 MAX_STORE_TIME = int(getenv("MAX_STORE_TIME", "259200"))  # 3 days by default
+MAX_CONTENT_LENGTH = int(getenv("MAX_CONTENT_LENGTH", "1048576"))  # 1 MB by default
 CLEAR_AT_RESTART = int(getenv("CLEAR_AT_RESTART", "0"))
+
+IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".gif", ".bmp", ".webp", ".tiff"]
+WORKER_FILES = ["binwalk", "foremost", "steghide", "zsteg", "openstego", "pcrt", "jpseek"]
+
+GOOGLE_ADS_TXT = getenv("GOOGLE_ADS_TXT", "")
+CUSTOM_EXTERNAL_SCRIPT = getenv("CUSTOM_EXTERNAL_SCRIPT", "")
+
+
+RESULT_FOLDER = Path(__file__).parent.resolve() / "results"
+REMOVED_IMAGES_FOLDER = Path(__file__).parent.resolve() / "removed_images"
+
+DB_URI = getenv("DB_URI", "")
+FLASK_DEBUG = bool(getenv("FLASK_DEBUG", "0") == "1")
@@ -13,6 +13,7 @@
  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/all.min.css" rel="stylesheet">
  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet">
  <link href="/static/css/aperisolve.css" rel="stylesheet">
+  <script async src="{{ config["CUSTOM_EXTERNAL_SCRIPT"]}}" crossorigin="anonymous"></script>
 </head>

 <body class="d-flex flex-column min-vh-100 text-light">
@@ -3,7 +3,7 @@

 [project]
 name = "aperisolve"
-version = "3.1.2"
+version = "3.1.3"
 description = "Open-source steganalysis web platform for automated image analysis and steganography detection"
 readme = "README.md"
 requires-python = ">=3.12"