dev (#1)

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

docker-compose.yml

@@ -1,45 +1,74 @@
-version: '3'
+# ⚠️  DEPRECATED: Use docker-compose.dev.yml or docker-compose.prod.yml instead
+# This file is kept for reference only
+#
+# For development: docker-compose.dev.yml (dev.merchbay.app)
+# For production:  docker-compose.prod.yml (merchbay.com)
+# For local dev:   docker-compose.local.yml (localhost:8080)
+
 services:
-  
-  #PHP Service
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: digitalocean.com/php
-    container_name: app
+    image: merchbay:latest
+    container_name: merchbay_app
     restart: unless-stopped
-    tty: true
     environment:
-      SERVICE_NAME: app
-      SERVICE_TAGS: dev
-    working_dir: /var/www
+      - APP_ENV=${APP_ENV:-production}
+      - APP_DEBUG=${APP_DEBUG:-false}
+      - APP_URL=${APP_URL:-http://localhost}
+      - DB_CONNECTION=mysql
+      - DB_HOST=${DB_HOST}
+      - DB_PORT=${DB_PORT:-3306}
+      - DB_DATABASE=${DB_DATABASE}
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - PROD_PRIVATE=${PROD_PRIVATE}
+      - IMAGES_URL=${IMAGES_URL}
+      - UPLOAD_URL=${UPLOAD_URL}
+      - FORCE_HTTPS=true
+      - MAIL_DRIVER=${MAIL_DRIVER}
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
+      - CAPTCHA_SITE_KEY=${CAPTCHA_SITE_KEY}
+      - CAPTCHA_SECRET_KEY=${CAPTCHA_SECRET_KEY}
+      - ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
+      - ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
+      - ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
     volumes:
-      - ./:/var/www
-      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+      - ./storage:/var/www/html/storage
+      - ./public/uploads:/var/www/html/public/uploads
+    labels:
+      - "traefik.enable=true"
+      # Development environment (dev.merchbay.app)
+      - "traefik.http.routers.merchbay-dev.rule=Host(`dev.merchbay.app`)"
+      - "traefik.http.routers.merchbay-dev.entrypoints=websecure"
+      - "traefik.http.routers.merchbay-dev.tls=true"
+      - "traefik.http.routers.merchbay-dev.tls.certresolver=letsencrypt"
+      - "traefik.http.services.merchbay-dev.loadbalancer.server.port=80"
+      # Production environment (merchbay.com) - Uses DigiCert SSL
+      - "traefik.http.routers.merchbay-prod.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
+      - "traefik.http.routers.merchbay-prod.entrypoints=websecure"
+      - "traefik.http.routers.merchbay-prod.tls=true"
+      - "traefik.http.services.merchbay-prod.loadbalancer.server.port=80"
+      # HTTP to HTTPS redirect - Development
+      - "traefik.http.routers.merchbay-dev-http.rule=Host(`dev.merchbay.app`)"
+      - "traefik.http.routers.merchbay-dev-http.entrypoints=web"
+      - "traefik.http.routers.merchbay-dev-http.middlewares=https-redirect"
+      # HTTP to HTTPS redirect - Production
+      - "traefik.http.routers.merchbay-prod-http.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
+      - "traefik.http.routers.merchbay-prod-http.entrypoints=web"
+      - "traefik.http.routers.merchbay-prod-http.middlewares=https-redirect"
+      - "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
     networks:
-      - app-network
+      - traefik-public
+      - crew-app-net
+      - default
 
-  #Nginx Service
-  webserver:
-    image: nginx:alpine
-    container_name: webserver
-    restart: unless-stopped
-    tty: true
-    ports:
-      - "10003:80"
-      - "10443:443"
-    volumes:
-      - ./:/var/www
-      - ./nginx/conf.d/:/etc/nginx/conf.d/
-    networks:
-      - app-network
-
-#Docker Networks
 networks:
-  app-network:
-    driver: bridge
-#Volumes
-volumes:
-  dbdata:
-    driver: local
+  traefik-public:
+    external: true
+  crew-app-net:
+    external: true
+  default:
+    driver: bridge