✨ Update design

.gitea/workflows/ci.yml

@@ -91,205 +91,70 @@ jobs:
           IMAGE_TAG: ${{ github.sha }}
 
         run: |
-          set -Eeuo pipefail
+          set -euo pipefail
 
-          trap 'echo "ERROR: command failed at line $LINENO: $BASH_COMMAND" >&2' ERR
+          mkdir -p ~/.ssh
 
-            echo "==> Preparing SSH"
+          printf '%s\n' "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
-            echo "DEPLOY_HOST=${DEPLOY_HOST:-<unset>}"
+          chmod 600 ~/.ssh/deploy_key
-            echo "DEPLOY_PORT=${DEPLOY_PORT:-22}"
-            echo "DEPLOY_USER=${DEPLOY_USER:-<unset>}"
-            echo "DEPLOY_PATH=${DEPLOY_PATH:-<unset>}"
-            echo "IMAGE_TAG=${IMAGE_TAG:-<unset>}"
 
-            echo "==> Checking required variables"
+          ssh-keyscan \
-            
-            required_vars=(
-            DEPLOY_HOST
-            DEPLOY_USER
-            DEPLOY_PATH
-            DEPLOY_SSH_KEY
-            POSTGRES_PASSWORD
-            BETTER_AUTH_SECRET
-            BETTER_AUTH_URL
-            RESEND_API_KEY
-            RESERVATIONS_FROM_EMAIL
-            STAFF_SEED_EMAIL
-            STAFF_SEED_PASSWORD
-            IMAGE_TAG
-            )
-            
-            for var in "${required_vars[@]}"; do
-            if [[ -z "${!var:-}" ]]; then
-          echo "ERROR: $var is missing or empty" >&2
-            exit 1
-            fi
-          echo "  OK: $var is set"
-            done
-            
-            echo "==> Creating ~/.ssh"
-            mkdir -p ~/.ssh
-            
-            echo "==> Writing deployment SSH key"
-            printf '%s\n' "$DEPLOY_SSH_KEY" > ~/.ssh/authorized_keys
-            chmod 600 ~/.ssh/authorized_keys
-            
-            echo "==> Scanning SSH host key"
-            ssh-keyscan \
             -p "${DEPLOY_PORT:-22}" \
             -H "$DEPLOY_HOST" \
             >> ~/.ssh/known_hosts
 
-            echo "==> SSH host key added"
+          echo "Creating deployment directory if needed..."
 
-            echo "==> Validating SSH private key"
+          ssh \
-  
+            -i ~/.ssh/deploy_key \
-            ssh-keygen -y -f ~/.ssh/authorized_keys >/dev/null \
-            && echo "SSH private key is valid" \
-            || {
-            echo "ERROR: SSH private key cannot be parsed"
-              exit 1
-            }
-            
-            echo "==> Testing SSH connection"
-            ssh \
-            -i ~/.ssh/authorized_keys \
             -p "${DEPLOY_PORT:-22}" \
             "$DEPLOY_USER@$DEPLOY_HOST" \
-            "echo 'SSH connection successful'; echo \"Remote host: \$(hostname)\"; echo \"Remote user: \$(whoami)\""
+            "mkdir -p '$DEPLOY_PATH'"
 
-            echo "==> Creating deployment directory if needed..."
+          echo "Uploading compose file..."
-            ssh \
-            -i ~/.ssh/authorized_keys \
-            -p "${DEPLOY_PORT:-22}" \
-            "$DEPLOY_USER@$DEPLOY_HOST" \
-            "mkdir -pv '$DEPLOY_PATH'"
 
-            echo "==> Verifying deployment directory..."
+          scp \
-            ssh \
+            -i ~/.ssh/deploy_key \
-            -i ~/.ssh/authorized_keys \
-            -p "${DEPLOY_PORT:-22}" \
-            "$DEPLOY_USER@$DEPLOY_HOST" \
-            "ls -ld '$DEPLOY_PATH'"
-          
-            echo "==> Uploading compose file..."
-          echo "    Local file: docker-compose.prod.yml"
-          echo "    Remote file: $DEPLOY_PATH/docker-compose.yml"
-            
-            scp \
-            -v \
-            -i ~/.ssh/authorized_keys \
             -P "${DEPLOY_PORT:-22}" \
             docker-compose.prod.yml \
             "$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/docker-compose.yml"
 
-            echo "==> Verifying uploaded compose file..."
+          echo "Deploying..."
-            ssh \
-            -i ~/.ssh/authorized_keys \
-            -p "${DEPLOY_PORT:-22}" \
-            "$DEPLOY_USER@$DEPLOY_HOST" \
-            "ls -lh '$DEPLOY_PATH/docker-compose.yml'"
 
-            echo "==> Starting deployment..."
+          ssh \
-            
+            -i ~/.ssh/deploy_key \
-            ssh \
-            -v \
-            -i ~/.ssh/authorized_keys \
             -p "${DEPLOY_PORT:-22}" \
             "$DEPLOY_USER@$DEPLOY_HOST" \
-            "$DEPLOY_USER@$DEPLOY_HOST" \
             "POSTGRES_PASSWORD=$(printf '%q' "$POSTGRES_PASSWORD") \
-            BETTER_AUTH_SECRET=$(printf '%q' "$BETTER_AUTH_SECRET") \
+             BETTER_AUTH_SECRET=$(printf '%q' "$BETTER_AUTH_SECRET") \
-            BETTER_AUTH_URL=$(printf '%q' "$BETTER_AUTH_URL") \
+             BETTER_AUTH_URL=$(printf '%q' "$BETTER_AUTH_URL") \
-            RESEND_API_KEY=$(printf '%q' "$RESEND_API_KEY") \
+             RESEND_API_KEY=$(printf '%q' "$RESEND_API_KEY") \
-            RESERVATIONS_FROM_EMAIL=$(printf '%q' "$RESERVATIONS_FROM_EMAIL") \
+             RESERVATIONS_FROM_EMAIL=$(printf '%q' "$RESERVATIONS_FROM_EMAIL") \
-            STAFF_SEED_EMAIL=$(printf '%q' "$STAFF_SEED_EMAIL") \
+             STAFF_SEED_EMAIL=$(printf '%q' "$STAFF_SEED_EMAIL") \
-            STAFF_SEED_PASSWORD=$(printf '%q' "$STAFF_SEED_PASSWORD") \
+             STAFF_SEED_PASSWORD=$(printf '%q' "$STAFF_SEED_PASSWORD") \
-            IMAGE_TAG=$(printf '%q' "$IMAGE_TAG") \
+             IMAGE_TAG=$(printf '%q' "$IMAGE_TAG") \
-            DEPLOY_PATH=$(printf '%q' "$DEPLOY_PATH") \
+             bash -c '
-            bash -c '
+               set -euo pipefail
-            set -Eeuo pipefail
 
-          trap '\''echo "ERROR: remote command failed at line $LINENO: $BASH_COMMAND" >&2'\''
+               cd \"$DEPLOY_PATH\"
 
-            echo "========================================"
+               echo \"Pulling images...\"
-            echo "REMOTE DEPLOYMENT"
+               docker compose pull
-            echo "========================================"
 
-            echo "==> Environment"
+               echo \"Starting PostgreSQL...\"
-            echo "    DEPLOY_PATH=\$DEPLOY_PATH"
+               docker compose up -d postgres
-            echo "    IMAGE_TAG=\$IMAGE_TAG"
-            echo "    DEPLOY_USER=\$(whoami)"
-            echo "    HOST=\$(hostname)"
-            echo "    PWD=\$(pwd)"
 
-            echo "==> Checking required commands"
+               echo "Running database migrations..."
+               docker compose run --rm app npx drizzle-kit migrate
           
-            command -v docker
+               echo "Seeding database..."
-          echo "    Docker: \$(docker --version)"
+               docker compose run --rm app npm run db:seed
           
-            docker compose version
+               echo "Starting application..."
-          echo "    Docker Compose: OK"
+               docker compose up -d
           
-            echo "==> Changing directory"
+               echo \"Cleaning unused images...\"
-            cd \"\$DEPLOY_PATH\"
+               docker image prune -f
 
-          echo "    Current directory: \$(pwd)"
+               echo \"Deployment complete.\"
-            
+             '"
-            echo "==> Listing deployment directory"
-            ls -lah
-            
-            echo "==> Validating Docker Compose configuration"
-            docker compose config
-            
-            echo "==> Docker Compose configuration is valid"
-            
-            echo "==> Pulling images..."
-            docker compose pull
-            
-            echo "==> Image pull completed"
-            
-            echo "==> Current containers before deployment"
-            docker compose ps
-            
-            echo "==> Starting PostgreSQL..."
-            docker compose up -d postgres
-            
-            echo "==> PostgreSQL start command completed"
-            
-            echo "==> PostgreSQL status"
-            docker compose ps postgres
-            
-            echo "==> PostgreSQL logs (last 50 lines)"
-            docker compose logs --tail=50 postgres || true
-            
-            echo "==> Running database migrations..."
-            docker compose run --rm app npx drizzle-kit migrate
-            
-            echo "==> Database migrations completed"
-            
-            echo "==> Seeding database..."
-            docker compose run --rm app npm run db:seed
-            
-            echo "==> Database seeding completed"
-            
-            echo "==> Starting application..."
-            docker compose up -d
-            
-            echo "==> Application startup completed"
-            
-            echo "==> Current container status"
-            docker compose ps
-            
-            echo "==> Recent application logs"
-            docker compose logs --tail=100 app || true
-            
-            echo "==> Cleaning unused images..."
-            docker image prune -f
-            
-            echo "========================================"
-            echo "DEPLOYMENT COMPLETE"
-            echo "========================================"
-            '"
-          
-          echo "==> Deployment finished successfully"