cd: wip

Author: rohsyl

.github/workflows/cd.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - 'main'
       - 'staging'
+      - 'feature/continuous' # temporary while testing
     tags:
       - 'v*'
   pull_request:
@@ -38,6 +39,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=staging,enable=${{ github.ref == 'refs/heads/staging' }}
 
       - name: Log in to GHCR
         uses: docker/login-action@v3

docker-compose.yml

@@ -3,14 +3,17 @@ services:
     image: ghcr.io/cncnet/cncnet-ladder-app:${APP_TAG}
     restart: unless-stopped
     container_name: cncnet_ladder_app
-    env_file: ".env"
+    user: "${HOST_UID:-1000}:${HOST_GID:-1000}"
+    env_file: ".app.env"
     environment:
       XDG_CONFIG_HOME: /app/.config
       XDG_DATA_HOME: /app/.data
     volumes:
       - caddy_data:/data
       - caddy_config:/config
       - ./cncnet-api/storage:/app/storage
+    ports:
+      - '${APP_PORT:-3000}:8000'
     depends_on:
       - redis
     networks:
@@ -22,7 +25,7 @@ services:
     container_name: cncnet_ladder_queue_findmatch
     depends_on:
       - app
-    env_file: ".env"
+    env_file: ".app.env"
     environment:
       QUEUE_NAME: 'findmatch'
     networks:
@@ -34,7 +37,7 @@ services:
     container_name: cncnet_ladder_queue_saveladderresult
     depends_on:
       - app
-    env_file: ".env"
+    env_file: ".app.env"
     environment:
       QUEUE_NAME: 'saveladderresult'
     networks:
@@ -46,7 +49,7 @@ services:
     container_name: cncnet_ladder_scheduler
     depends_on:
       - app
-    env_file: ".env"
+    env_file: ".app.env"
     networks:
       - cncnet
 
@@ -70,8 +73,6 @@ services:
     container_name: cncnet_ladder_mysql
     restart: unless-stopped
     command: --max_connections=1000 --max_allowed_packet=128M --log_warnings=3 --wait_timeout=31536000 --slow-query-log --interactive_timeout=31536000
-    ports:
-      - "3307:3306"
     environment:
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
@@ -91,7 +92,7 @@ services:
   db-backup:
     container_name: cncnet_ladder_backup
     env_file:
-      - '.env'
+      - '.backup.env'
     image: tiredofit/db-backup
     volumes:
       - ./backups:/backup