From a4709cd6afc6a2f643625d7d198d4af9779bec28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczyk?= Date: Wed, 25 May 2022 15:01:35 +0200 Subject: [PATCH] wip --- docker-compose.accounts.yml | 46 +++++++++++------------ docker/nginx/conf.d/server/server.account | 8 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 7ec78a04..ed437772 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -54,29 +54,29 @@ services: depends_on: - mongo - dashboard: - # uncomment "build" and comment out "image" to build from sources - build: - context: https://github.com/SkynetLabs/skynet-webportal.git#master - dockerfile: ./packages/dashboard/Dockerfile - # image: skynetlabs/dashboard - container_name: dashboard - restart: unless-stopped - logging: *default-logging - env_file: - - .env - environment: - - NEXT_PUBLIC_PORTAL_DOMAIN=${PORTAL_DOMAIN} - - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} - volumes: - - ./docker/data/dashboard/.next:/usr/app/.next - networks: - shared: - ipv4_address: 10.10.10.85 - expose: - - 3000 - depends_on: - - mongo + # dashboard: + # # uncomment "build" and comment out "image" to build from sources + # build: + # context: https://github.com/SkynetLabs/skynet-webportal.git#master + # dockerfile: ./packages/dashboard/Dockerfile + # # image: skynetlabs/dashboard + # container_name: dashboard + # restart: unless-stopped + # logging: *default-logging + # env_file: + # - .env + # environment: + # - NEXT_PUBLIC_PORTAL_DOMAIN=${PORTAL_DOMAIN} + # - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} + # volumes: + # - ./docker/data/dashboard/.next:/usr/app/.next + # networks: + # shared: + # ipv4_address: 10.10.10.85 + # expose: + # - 3000 + # depends_on: + # - mongo # Do not build dashboard-v2 until we're ready to make a switch # ============================================================ diff --git a/docker/nginx/conf.d/server/server.account b/docker/nginx/conf.d/server/server.account index 830af397..8dd38a97 100644 --- a/docker/nginx/conf.d/server/server.account +++ b/docker/nginx/conf.d/server/server.account @@ -4,13 +4,13 @@ include /etc/nginx/conf.d/include/ssl-settings; include /etc/nginx/conf.d/include/init-optional-variables; # Uncomment to launch new Dashboard under /v2 path -location /v2 { +location / { proxy_pass http://dashboard-v2:9000; } -location / { - proxy_pass http://dashboard:3000; -} +#location / { +# proxy_pass http://dashboard:3000; +#} location /health { proxy_pass http://accounts:3000;