From 4604ab6211db5772bbc000699aa392af8ebaed10 Mon Sep 17 00:00:00 2001
From: Zeecka <alexgarrido@protonmail.com>
Date: Fri, 9 Jan 2026 23:55:52 +0100
Subject: [PATCH] fix compose, remove lower_actor

---
 .github/workflows/release.yml |  7 ++-----
 compose.yml                   | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e965e04..f3bc089 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,9 +13,6 @@ jobs:
     - 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: Determine tag type (prod vs main)
       id: tag_type
       run: |
@@ -51,8 +48,8 @@ jobs:
         context: ./
         push: true
         tags: |
-          ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }}
-          ghcr.io/${{ env.lower_actor }}/aperisolve:prod
+          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)
diff --git a/compose.yml b/compose.yml
index 58fb1b0..ea56852 100644
--- a/compose.yml
+++ b/compose.yml
@@ -5,12 +5,14 @@ services:
     container_name: aperisolve-web
     restart: always
     ports:
-      - "80:5000"
+      - "5000:5000"
     volumes:
-      - apresults:/aperisolve/results
+      - apresults:/app/aperisolve/results
     depends_on:
       postgres:
         condition: service_healthy
+      initdb:
+        condition: service_completed_successfully
       redis:
         condition: service_started
       worker:
@@ -31,14 +33,16 @@ services:
     restart: always
     command: rq worker default --url redis://redis:6379/0
     volumes:
-      - apresults:/aperisolve/results
+      - apresults:/app/aperisolve/results
     depends_on:
-      - redis
-      - postgres
+      postgres:
+        condition: service_healthy
+      initdb:
+        condition: service_completed_successfully
+      redis:
+        condition: service_started
     env_file:
       - .env
-    environment:
-      - CLEAR_AT_RESTART=0  # Always false for worker to prevent double clearing
 
   initdb:
     image: ghcr.io/zeecka/aperisolve:latest
@@ -46,7 +50,7 @@ services:
     container_name: aperisolve-initdb
     command: python -m aperisolve.utils.init_db
     volumes:
-      - apresults:/aperisolve/results
+      - apresults:/app/aperisolve/results
     depends_on:
       postgres:
         condition: service_healthy