✨ first version

.gitea/workflows/ci.yml

@@ -79,39 +79,75 @@ jobs:
           DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
           DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
           DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          BETTER_AUTH_SECRET: ${{ secrets.BETTER_AUTH_SECRET }}
+          BETTER_AUTH_URL: ${{ secrets.BETTER_AUTH_URL }}
+          RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
+          RESERVATIONS_FROM_EMAIL: ${{ secrets.RESERVATIONS_FROM_EMAIL }}
+
           IMAGE_TAG: ${{ github.sha }}
+
         run: |
           set -euo pipefail
 
           mkdir -p ~/.ssh
+
           printf '%s\n' "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
 
-          ssh-keyscan -p "${DEPLOY_PORT:-22}" -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts
+          ssh-keyscan \
+            -p "${DEPLOY_PORT:-22}" \
+            -H "$DEPLOY_HOST" \
+            >> ~/.ssh/known_hosts
 
           echo "Creating deployment directory if needed..."
-          ssh -i ~/.ssh/deploy_key \
+
+          ssh \
+            -i ~/.ssh/deploy_key \
             -p "${DEPLOY_PORT:-22}" \
             "$DEPLOY_USER@$DEPLOY_HOST" \
             "mkdir -p '$DEPLOY_PATH'"
 
           echo "Uploading compose file..."
-          scp -i ~/.ssh/deploy_key \
+
+          scp \
+            -i ~/.ssh/deploy_key \
             -P "${DEPLOY_PORT:-22}" \
             docker-compose.prod.yml \
             "$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/docker-compose.yml"
 
           echo "Deploying..."
-          ssh -i ~/.ssh/deploy_key \
+
+          ssh \
+            -i ~/.ssh/deploy_key \
             -p "${DEPLOY_PORT:-22}" \
             "$DEPLOY_USER@$DEPLOY_HOST" \
-            "cd '$DEPLOY_PATH' && \
-             IMAGE_TAG='$IMAGE_TAG' docker compose pull && \
-             IMAGE_TAG='$IMAGE_TAG' docker compose up -d postgres && \
-             IMAGE_TAG='$IMAGE_TAG' docker compose run --rm app npx drizzle-kit migrate && \
-             IMAGE_TAG='$IMAGE_TAG' docker compose up -d && \
-             docker image prune -f"
+            "POSTGRES_PASSWORD=$(printf '%q' "$POSTGRES_PASSWORD") \
+             BETTER_AUTH_SECRET=$(printf '%q' "$BETTER_AUTH_SECRET") \
+             BETTER_AUTH_URL=$(printf '%q' "$BETTER_AUTH_URL") \
+             RESEND_API_KEY=$(printf '%q' "$RESEND_API_KEY") \
+             RESERVATIONS_FROM_EMAIL=$(printf '%q' "$RESERVATIONS_FROM_EMAIL") \
+             IMAGE_TAG=$(printf '%q' "$IMAGE_TAG") \
+             bash -c '
+               set -euo pipefail
 
+               cd \"$DEPLOY_PATH\"
 
+               echo \"Pulling images...\"
+               docker compose pull
 
+               echo \"Starting PostgreSQL...\"
+               docker compose up -d postgres
 
+               echo \"Running database migrations...\"
+               docker compose run --rm app npx drizzle-kit migrate
+
+               echo \"Starting application...\"
+               docker compose up -d
+
+               echo \"Cleaning unused images...\"
+               docker image prune -f
+
+               echo \"Deployment complete.\"
+             '"

docker-compose.prod.yml

@@ -11,7 +11,8 @@ services:
       RESEND_API_KEY: ${RESEND_API_KEY}
       RESERVATIONS_FROM_EMAIL: ${RESERVATIONS_FROM_EMAIL}
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
 
   postgres:
     image: postgres:16-alpine
@@ -22,6 +23,11 @@ services:
       POSTGRES_DB: steakhouse
     volumes:
       - steakhouse-postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U steakhouse -d steakhouse"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
 volumes:
   steakhouse-postgres-data: