Add entrypoint script and update Dockerfile for proper initialization; modify Traefik labels for production environment

Co-authored-by: Frank John Begornia <frank.begornia@yahoo.com>
Reviewed-on: #2

.gitea/workflows/deploy-dev.yml

@@ -51,7 +51,7 @@ jobs:
         run: |
           scp -i ~/.ssh/id_ed25519 \
             /workspace/repo/merchbay_admin_dev.tar.gz \
-            /workspace/repo/docker-compose.yml \
+            /workspace/repo/docker-compose.dev.yml \
             ${DEPLOY_USER}@${DEPLOY_HOST}:/tmp/
 
       # 5️⃣ Deploy on server
@@ -75,7 +75,7 @@ jobs:
             docker images | grep merchbay_admin | grep -v "$(docker images merchbay_admin:dev -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
 
             echo "📄 Updating compose file"
-            cp /tmp/docker-compose.yml "$DEPLOY_DIR/"
+            cp /tmp/docker-compose.dev.yml "$DEPLOY_DIR/docker-compose.yml"
 
             cd "$DEPLOY_DIR"
 
@@ -114,7 +114,7 @@ jobs:
             fi
 
             echo "🧹 Cleanup"
-            rm -f /tmp/merchbay_admin_dev.tar.gz /tmp/docker-compose.yml
+            rm -f /tmp/merchbay_admin_dev.tar.gz /tmp/docker-compose.dev.yml
             
             echo "🧹 Aggressive Docker cleanup to reclaim space"
             docker image prune -af --filter "until=24h" || true

.gitea/workflows/deploy.yml

@@ -12,80 +12,158 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
-    
+
     steps:
+      # 1️⃣ Checkout code
       - name: Checkout code
         shell: sh
         run: |
-          git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo || true
+          git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo
           cd /workspace/repo
-          git fetch origin $GITHUB_REF_NAME
           git checkout $GITHUB_REF_NAME
-          git pull origin $GITHUB_REF_NAME
 
-      - name: Build Docker Image
+      # 2️⃣ Build image
+      - name: Build Docker image
         shell: sh
         run: |
           cd /workspace/repo
           docker build -t merchbay_admin:latest .
           docker save merchbay_admin:latest | gzip > merchbay_admin.tar.gz
 
-      - name: Setup SSH and Deploy
+      # 3️⃣ Setup SSH
+      - name: Setup SSH
         shell: sh
         env:
           DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
-          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
           DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
         run: |
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
-          echo "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
+          echo "$DEPLOY_SSH_KEY" > ~/.ssh/id_ed25519
-          chmod 600 ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/id_ed25519
-          ssh-keygen -y -f ~/.ssh/deploy_key > /dev/null 2>&1 || { echo "Error: Invalid SSH key format"; exit 1; }
+          ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts
-          
-          cd /workspace/repo
-          scp -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key merchbay_admin.tar.gz docker-compose.yml "$DEPLOY_USER@$DEPLOY_HOST:/tmp/"
-          
-          ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" 'bash -s' << 'ENDSSH'
-          set -e
-          DEPLOY_DIR="/var/www/merchbay_admin"
-          mkdir -p "$DEPLOY_DIR"
-          cd /tmp
-          docker load < merchbay_admin.tar.gz
-          
-          echo "Removing old merchbay_admin images"
-          CURRENT_IMAGE=$(docker images merchbay_admin:latest -q)
-          docker images | grep merchbay_admin | grep -v "$CURRENT_IMAGE" | awk '{print $3}' | xargs -r docker rmi -f || true
-          
-          cp docker-compose.yml "$DEPLOY_DIR/"
-          cd "$DEPLOY_DIR"
-          
-          docker compose down || true
-          docker image prune -f
-          docker network inspect traefik-public >/dev/null 2>&1 || docker network create traefik-public
-          docker network inspect crew-app-net >/dev/null 2>&1 || docker network create crew-app-net
-          export DOMAIN=admin.merchbay.app
-          export APP_URL=https://admin.merchbay.app
-          docker compose up -d
-          sleep 10
-          docker compose exec -T app php artisan config:cache
-          docker compose exec -T app php artisan route:cache
-          rm -f /tmp/merchbay_admin.tar.gz /tmp/docker-compose.yml
-          
-          echo "Aggressive Docker cleanup to reclaim space"
-          docker image prune -af --filter "until=24h" || true
-          docker container prune -f || true
-          docker volume prune -f || true
-          docker builder prune -af --filter "until=48h" || true
-          echo "Docker space usage:"
-          docker system df
-          
-          echo "Production deployment completed successfully!"
-          echo "Application available at: https://admin.merchbay.app"
-          ENDSSH
 
-      - name: Health Check
+      # 4️⃣ Upload artifacts
+      - name: Upload image and compose
+        shell: sh
+        env:
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+        run: |
+          scp -i ~/.ssh/id_ed25519 \
+            /workspace/repo/merchbay_admin.tar.gz \
+            /workspace/repo/docker-compose.prod.yml \
+            ${DEPLOY_USER}@${DEPLOY_HOST}:/tmp/
+
+      # 5️⃣ Deploy on server
+      - name: Deploy on server
+        shell: sh
+        env:
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+
+        run: |
+          ssh -i ~/.ssh/id_ed25519 $DEPLOY_USER@$DEPLOY_HOST << 'EOF'
+            set -e
+
+            DEPLOY_DIR="/var/www/apps/merchbay_admin"
+            sudo mkdir -p "$DEPLOY_DIR"
+            sudo chown $USER:$USER "$DEPLOY_DIR"
+
+            echo "📦 Loading image"
+            docker load < /tmp/merchbay_admin.tar.gz
+
+            echo "🧹 Removing old merchbay_admin images"
+            docker images | grep merchbay_admin | grep -v "$(docker images merchbay_admin:latest -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
+
+            echo "📄 Updating compose file"
+            cp /tmp/docker-compose.prod.yml "$DEPLOY_DIR/docker-compose.yml"
+
+            cd "$DEPLOY_DIR"
+
+            echo "🔍 Checking .env file"
+            if [ ! -f .env ]; then
+              echo "❌ .env file not found at $DEPLOY_DIR/.env"
+              echo "Please create it first with required variables:"
+              echo "  - DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER"
+              exit 1
+            fi
+
+            echo "🔧 Fixing .env permissions"
+            sudo chown $USER:$USER .env
+            sudo chmod 600 .env
+
+            echo "🌐 Ensure networks"
+            docker network inspect traefik-public >/dev/null 2>&1 || \
+              docker network create traefik-public
+            docker network inspect crew-app-net >/dev/null 2>&1 || \
+              docker network create crew-app-net
+
+            echo "<22> Stopping and removing existing containers"
+            docker compose down || true
+            docker rm -f merchbay_admin_app || true
+
+            echo "<22>🚀 Starting containers (env vars from .env file)"
+            docker compose up -d
+
+            echo "⏳ Waiting for app container"
+            sleep 15
+
+            if docker ps --format '{{.Names}}' | grep -q merchbay_admin_app; then
+              echo "🧹 Running migrations and clearing caches"
+              docker compose exec -T app php artisan config:clear
+              docker compose exec -T app php artisan config:cache
+            else
+              echo "❌ App container not running"
+              docker compose logs
+              exit 1
+            fi
+
+            echo "🧹 Cleanup"
+            rm -f /tmp/merchbay_admin.tar.gz /tmp/docker-compose.prod.yml
+            
+            echo "🧹 Aggressive Docker cleanup to reclaim space"
+            docker image prune -af --filter "until=24h" || true
+            docker container prune -f || true
+            docker volume prune -f || true
+            docker builder prune -af --filter "until=48h" || true
+            echo "📊 Docker space usage:"
+            docker system df
+            
+            rm -f /tmp/merchbay_admin.tar.gz /tmp/docker-compose.prod.yml
+
+            echo "✅ Production deployment completed!"
+            echo "🌐 Application available at: https://admin.merchbay.app"
+          EOF
+
+
+      # 6️⃣ Health check
+      - name: Health check
         shell: sh
         run: |
-          sleep 10
+          echo "⏳ Waiting for app to be ready..."
-          curl -f https://admin.merchbay.app || exit 1
+          sleep 20
+          
+          echo "🔍 Testing health check (ignoring SSL cert for now)..."
+          HTTP_CODE=$(curl -k -s -o /dev/null -w "%{http_code}" --max-time 30 https://admin.merchbay.app || echo "000")
+          
+          if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ] || [ "$HTTP_CODE" = "301" ]; then
+            echo "✅ Health check passed! (HTTP $HTTP_CODE)"
+            echo "🎉 Production deployment successful!"
+          else
+            echo "❌ Health check failed! (HTTP $HTTP_CODE)"
+            echo ""
+            echo "💡 Troubleshooting:"
+            echo "  1. Check if container is running:"
+            echo "     docker ps | grep merchbay_admin_app"
+            echo ""
+            echo "  2. Check app logs:"
+            echo "     docker logs merchbay_admin_app"
+            echo ""
+            echo "  3. Check Traefik logs:"
+            echo "     docker logs traefik"
+            echo ""
+            echo "  4. Test manually:"
+            echo "     curl -Ik https://admin.merchbay.app"
+            exit 1
+          fi

Dockerfile

@@ -32,6 +32,10 @@ WORKDIR /var/www/html
 # Copy existing application directory contents
 COPY . /var/www/html
 
+# Copy and set permissions for entrypoint script
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
 # Create storage directories and set permissions
 RUN mkdir -p storage/framework/views \
     storage/framework/cache \
@@ -67,5 +71,8 @@ RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 # Expose port 80
 EXPOSE 80
 
+# Set entrypoint
+ENTRYPOINT ["docker-entrypoint.sh"]
+
 # Start Apache
 CMD ["apache2-foreground"]

docker-compose.dev.yml

@@ -0,0 +1,45 @@
+services:
+  app:
+    image: merchbay_admin:dev
+    container_name: merchbay_admin_app
+    restart: unless-stopped
+    environment:
+      - APP_ENV=${APP_ENV:-development}
+      - APP_DEBUG=${APP_DEBUG:-true}
+      - APP_URL=${APP_URL:-https://dev-admin.merchbay.app}
+      - DB_CONNECTION=mysql
+      - DB_HOST=${DB_HOST}
+      - DB_PORT=${DB_PORT:-3306}
+      - DB_DATABASE=${DB_DATABASE}
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - IMAGES_DIRECTORY=${IMAGES_DIRECTORY}
+      - PRODUCTION_PRIVATE_SERVER=${PRODUCTION_PRIVATE_SERVER}
+    volumes:
+      - ./storage:/var/www/html/storage
+      - ./public/uploads:/var/www/html/public/uploads
+    labels:
+      - "traefik.enable=true"
+      # Development environment (dev-admin.merchbay.app)
+      - "traefik.http.routers.merchbay-admin-dev.rule=Host(`dev-admin.merchbay.app`)"
+      - "traefik.http.routers.merchbay-admin-dev.entrypoints=websecure"
+      - "traefik.http.routers.merchbay-admin-dev.tls=true"
+      - "traefik.http.routers.merchbay-admin-dev.tls.certresolver=letsencrypt"
+      - "traefik.http.services.merchbay-admin-dev.loadbalancer.server.port=80"
+      # HTTP to HTTPS redirect
+      - "traefik.http.routers.merchbay-admin-dev-http.rule=Host(`dev-admin.merchbay.app`)"
+      - "traefik.http.routers.merchbay-admin-dev-http.entrypoints=web"
+      - "traefik.http.routers.merchbay-admin-dev-http.middlewares=https-redirect"
+      - "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
+    networks:
+      - traefik-public
+      - crew-app-net
+      - default
+
+networks:
+  traefik-public:
+    external: true
+  crew-app-net:
+    external: true
+  default:
+    driver: bridge

docker-compose.prod.yml

@@ -0,0 +1,45 @@
+services:
+  app:
+    image: merchbay_admin:latest
+    container_name: merchbay_admin_app
+    restart: unless-stopped
+    environment:
+      - APP_ENV=${APP_ENV:-production}
+      - APP_DEBUG=${APP_DEBUG:-false}
+      - APP_URL=${APP_URL:-https://merchbay.app}
+      - DB_CONNECTION=mysql
+      - DB_HOST=${DB_HOST}
+      - DB_PORT=${DB_PORT:-3306}
+      - DB_DATABASE=${DB_DATABASE}
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - IMAGES_DIRECTORY=${IMAGES_DIRECTORY}
+      - PRODUCTION_PRIVATE_SERVER=${PRODUCTION_PRIVATE_SERVER}
+    volumes:
+      - ./storage:/var/www/html/storage
+      - ./public/uploads:/var/www/html/public/uploads
+    labels:
+      - "traefik.enable=true"
+      # Production environment (merchbay.app)
+      - "traefik.http.routers.merchbay-admin-prod.rule=Host(`merchbay.app`)"
+      - "traefik.http.routers.merchbay-admin-prod.entrypoints=websecure"
+      - "traefik.http.routers.merchbay-admin-prod.tls=true"
+      - "traefik.http.routers.merchbay-admin-prod.tls.certresolver=le"
+      - "traefik.http.services.merchbay-admin-prod.loadbalancer.server.port=80"
+      # HTTP to HTTPS redirect
+      - "traefik.http.routers.merchbay-admin-prod-http.rule=Host(`merchbay.app`)"
+      - "traefik.http.routers.merchbay-admin-prod-http.entrypoints=web"
+      - "traefik.http.routers.merchbay-admin-prod-http.middlewares=https-redirect"
+      - "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
+    networks:
+      - traefik-public
+      - crew-app-net
+      - default
+
+networks:
+  traefik-public:
+    external: true
+  crew-app-net:
+    external: true
+  default:
+    driver: bridge

docker-entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+# Create storage directory structure if it doesn't exist
+mkdir -p storage/framework/views
+mkdir -p storage/framework/cache
+mkdir -p storage/framework/sessions
+mkdir -p storage/logs
+mkdir -p storage/app/public
+mkdir -p bootstrap/cache
+mkdir -p public/uploads
+
+# Set proper permissions
+chown -R www-data:www-data storage bootstrap/cache public/uploads
+chmod -R 775 storage bootstrap/cache public/uploads
+
+# Execute the main command
+exec "$@"