From caa5289ffd1f06d88f3b4804ee98296cc6d2ccff Mon Sep 17 00:00:00 2001
From: Zeecka <alexgarrido@protonmail.com>
Date: Sun, 4 Jan 2026 18:26:39 +0100
Subject: [PATCH] fix conflicts

---
 .env                           | 10 ----------
 .github/workflows/releases.yml | 24 ++++++++++++++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 68b1939..0000000
--- a/.env
+++ /dev/null
@@ -1,10 +0,0 @@
-MAX_CONTENT_LENGTH=1048576
-MAX_PENDING_TIME=600
-MAX_STORE_TIME=259200
-FLASK_DEBUG=0
-FLASK_ENV=production
-DB_URI=postgresql://aperiuser:iacyANdLeUREonIuMPorpHySTaIsHEAn@postgres:5432/aperisolve
-RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
-POSTGRES_DB=aperisolve
-POSTGRES_USER=aperiuser
-POSTGRES_PASSWORD=iacyANdLeUREonIuMPorpHySTaIsHEAn
\ No newline at end of file
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 42b1404..561cabc 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -10,22 +10,24 @@ jobs:
   docker-releases:
 
     runs-on: ubuntu-latest
+     if: startsWith(github.ref, 'refs/tags/') && (github.ref_name == 'main' || github.ref_name == 'prod')
+
     steps:
     - name: Get release version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-    
+
     - name: downcase username
       run: echo "lower_actor=${GITHUB_ACTOR,,}" >> $GITHUB_ENV
 
     - name: Checkout
       uses: actions/checkout@v4
-      
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
-    
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    
+
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3
       with:
@@ -33,11 +35,21 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Determine latest tag
+      run: |
+        if [[ "${GITHUB_REF_NAME}" == "main" ]]; then
+          echo "LATEST_TAG=latest" >> $GITHUB_ENV
+        elif [[ "${GITHUB_REF_NAME}" == "prod" ]]; then
+          echo "LATEST_TAG=latest-prod" >> $GITHUB_ENV
+        else
+          echo "LATEST_TAG=" >> $GITHUB_ENV
+        fi
+
     - name: Build and push Docker images
       uses: docker/build-push-action@v6.9.0
       with:
           context: ./
           push: true
           tags: |
-                 ghcr.io/${{ env.lower_actor }}/aperisolve:prod
-  
\ No newline at end of file
+            ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.LATEST_TAG }}