diff --git a/.gitea/workflows/production_release.yml b/.gitea/workflows/production_release.yml index 5757a3c4..e7ae54fc 100644 --- a/.gitea/workflows/production_release.yml +++ b/.gitea/workflows/production_release.yml @@ -111,7 +111,7 @@ jobs: "REDIS_ADDR=${{ vars.PROD_REDIS_ADDR }}" \ "DESCOPE_PROJECT_ID=${{ vars.DESCOPE_PROJECT_ID }}" \ "DESCOPE_MANAGEMENT_KEY=${{ secrets.DESCOPE_MANAGEMENT_KEY }}" \ - "NAVER_CLOUD_ACCESS_KEY=${{ secrets.NAVER_CLOUD_ACCESS_KEY }}" \ + "NAVER_CLOUD_ACCESS_KEY=${{ vars.NAVER_CLOUD_ACCESS_KEY }}" \ "NAVER_CLOUD_SECRET_KEY=${{ secrets.NAVER_CLOUD_SECRET_KEY }}" \ "NAVER_CLOUD_SERVICE_ID=${{ vars.NAVER_CLOUD_SERVICE_ID }}" \ "NAVER_SENDER_PHONE_NUMBER=${{ vars.NAVER_SENDER_PHONE_NUMBER }}" \ diff --git a/docker-compose_local.yaml b/docker-compose_local.yaml new file mode 100644 index 00000000..02874c45 --- /dev/null +++ b/docker-compose_local.yaml @@ -0,0 +1,57 @@ +name: baron-sso + +services: + backend: + build: + context: ./backend + dockerfile: Dockerfile + container_name: baron_backend + restart: unless-stopped + env_file: + - .env + environment: + - APP_ENV=${APP_ENV:-production} + - APP_ENV=production + - COOKIE_SECRET=4d15a1dc777757fb5300e6727368238dc7be055c49b48c56715687547e09778b + - DB_HOST=postgres + - CLICKHOUSE_HOST=clickhouse + - CLICKHOUSE_PORT=${CLICKHOUSE_PORT_NATIVE:-9000} + - CLICKHOUSE_USER=${CLICKHOUSE_USER:-baron} + - CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password} + ports: + - "${BACKEND_PORT:-3010}:3010" + depends_on: + - infra_check + healthcheck: + test: ["CMD", "wget", "-qO-", "http://127.0.0.1:3010/health"] + interval: 10s + timeout: 5s + retries: 3 + start_period: 10s + networks: + - baron_net + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + container_name: baron_frontend + restart: unless-stopped + ports: + - "${FRONTEND_PORT:-80}:80" + depends_on: + backend: + condition: service_healthy + networks: + - baron_net + + infra_check: + image: alpine + command: ["echo", "Infrastructure assumed running"] + networks: + - baron_net + +networks: + baron_net: + external: true + name: baron_network diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 8d160cb8..3939d9c1 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -20,14 +20,14 @@ log_format json_combined escape=json '}'; server { - listen 5000; + listen 80; include /etc/nginx/mime.types; access_log /var/log/nginx/access.log json_combined; # Backend API Proxy location /api { - proxy_pass http://baron_backend:3000; + proxy_pass http://baron_backend:3010; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;