diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 1e786c11..93d17bf9 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -21,8 +21,8 @@ services: accounts: # uncomment "build" and comment out "image" to build from sources - # build: https://github.com/SkynetLabs/skynet-accounts.git#main - image: skynetlabs/skynet-accounts:1.1.0 + build: https://github.com/SkynetLabs/skynet-accounts.git#main + # image: skynetlabs/skynet-accounts:1.1.0 container_name: accounts restart: unless-stopped logging: *default-logging @@ -56,10 +56,10 @@ services: 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 + 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 @@ -80,25 +80,25 @@ services: # Do not build dashboard-v2 until we're ready to make a switch # ============================================================ - # dashboard-v2: - # build: - # context: ./packages/dashboard-v2 - # dockerfile: Dockerfile - # container_name: dashboard-v2 - # restart: unless-stopped - # logging: *default-logging - # env_file: - # - .env - # environment: - # - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN} - # - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} - # volumes: - # - ./docker/data/dashboard-v2/.cache:/usr/app/.cache - # - ./docker/data/dashboard-v2/public:/usr/app/public - # networks: - # shared: - # ipv4_address: 10.10.10.86 - # expose: - # - 9000 - # depends_on: - # - mongo + dashboard-v2: + build: + context: ./packages/dashboard-v2 + dockerfile: Dockerfile + container_name: dashboard-v2 + restart: unless-stopped + logging: *default-logging + env_file: + - .env + environment: + - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN} + - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} + volumes: + - ./docker/data/dashboard-v2/.cache:/usr/app/.cache + - ./docker/data/dashboard-v2/public:/usr/app/public + networks: + shared: + ipv4_address: 10.10.10.86 + expose: + - 9000 + depends_on: + - mongo diff --git a/docker/nginx/conf.d/server/server.account b/docker/nginx/conf.d/server/server.account index 9d444296..a538bdaf 100644 --- a/docker/nginx/conf.d/server/server.account +++ b/docker/nginx/conf.d/server/server.account @@ -4,9 +4,9 @@ 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 { -# proxy_pass http://dashboard-v2:9000; -# } +location /v2 { + proxy_pass http://dashboard-v2:9000; +} location / { proxy_pass http://dashboard:3000;