chore: fix merge commit

Author: pythoninthegrass

.github/workflows/docker.yml

@@ -97,7 +97,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch || 'main') }}
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v3
@@ -110,6 +110,7 @@ jobs:
         with:
           context: .
           file: ./${{ matrix.dockerfile }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USER }}/${{ steps.image_name.outputs.IMAGE }}:buildcache

process-compose.yml

@@ -14,26 +14,45 @@ is_strict: true
 disable_env_expansion: true
 
 processes:
-  redis:
+  flask:
+   command: flask --app main run
+   working_dir: ./app
+   environment:
+    - FLASK_APP=main
+    - FLASK_DEBUG=True
+   depends_on:
+      db:
+        condition: "process_started"
+   availability:
+    restart: "always"
+    backoff_seconds: 5  # default: 1
+    max_restarts: 0     # default: 0 (unlimited)
+
+  db:
     command: >
       docker run --rm -d \
-        --name "${NAME:-devbox-redis}" \
-        -p "${PORT:-6379}:6379" \
-        "redis:${VERSION:-6.2}-alpine"
+        --name ${CONTAINER_NAME} \
+        -e POSTGRES_INITDB_ARGS="--locale-provider=icu --icu-locale=en_US.UTF-8" \
+        -e POSTGRES_DB=${POSTGRES_DB} \
+        -e POSTGRES_USER=${POSTGRES_USER} \
+        -e POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \
+        -p ${PORT}:5432 \
+        postgres:${VERSION}-alpine3.20
     is_daemon: true
-    environment: null
+    is_tty: false
+    environment:
+      - CONTAINER_NAME=${CONTAINER_NAME:-devbox-postgres}
+      - VERSION=${VERSION:-16.3}
+      - PORT=${PORT:-5432}
+      - POSTGRES_DB=${DB_NAME:-postgres}
+      - POSTGRES_USER=${DB_USER:-postgres}
+      - POSTGRES_PASSWORD=${DB_PASS?}
     readiness_probe:
       exec:
         command: >
-          timeout 12s bash -c \
-          "until echo PING \
-          | nc -z localhost ${PORT:-6379} \
-          ; do sleep 1 \
+          timeout 30s bash -c \
+          "until docker exec ${CONTAINER_NAME} pg_isready \
+          ; do sleep 3 \
           ; done"
-    availability:
-      exit_on_end: true
-    is_tty: false
     shutdown:
-      command: "docker stop ${NAME:-devbox-redis}"
-      timeout_seconds: 10           # default: 10
-      signal: 15                    # default: 15
+      command: "docker stop ${CONTAINER_NAME}"