wip

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
+    build: https://github.com/SkynetLabs/skynet-accounts.git#dashboard-v2-tests
-    image: skynetlabs/skynet-accounts:1.1.0
+    # image: skynetlabs/skynet-accounts:1.1.0
     container_name: accounts
     restart: unless-stopped
     logging: *default-logging
@@ -54,51 +54,51 @@ services:
     depends_on:
       - mongo
 
-  dashboard:
+  # dashboard:
-    # uncomment "build" and comment out "image" to build from sources
+  #   # 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
-  # ============================================================
-  # dashboard-v2:
   #   build:
-  #     context: ./packages/dashboard-v2
+  #     context: https://github.com/SkynetLabs/skynet-webportal.git#master
-  #     dockerfile: Dockerfile
+  #     dockerfile: ./packages/dashboard/Dockerfile
-  #   container_name: dashboard-v2
+  #   # image: skynetlabs/dashboard
+  #   container_name: dashboard
   #   restart: unless-stopped
   #   logging: *default-logging
   #   env_file:
   #     - .env
   #   environment:
-  #     - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
+  #     - NEXT_PUBLIC_PORTAL_DOMAIN=${PORTAL_DOMAIN}
-  #     - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
+  #     - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
   #   volumes:
-  #     - ./docker/data/dashboard-v2/.cache:/usr/app/.cache
+  #     - ./docker/data/dashboard/.next:/usr/app/.next
-  #     - ./docker/data/dashboard-v2/public:/usr/app/public
   #   networks:
   #     shared:
-  #       ipv4_address: 10.10.10.86
+  #       ipv4_address: 10.10.10.85
   #   expose:
-  #     - 9000
+  #     - 3000
   #   depends_on:
   #     - mongo
+
+  # 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

docker/nginx/conf.d/server/server.account

@@ -4,30 +4,14 @@ 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 / {
-    proxy_pass http://dashboard:3000;
+  proxy_pass http://dashboard-v2:9000;
 }
 
 location /health {
     proxy_pass http://accounts:3000;
 }
 
-location /stripe/webhook {
-    proxy_pass http://accounts:3000;
-}
-
-location /api/stripe/billing {
-    proxy_pass http://dashboard:3000;
-}
-
-location /api/stripe/checkout {
-    proxy_pass http://dashboard:3000;
-}
-
 location /api {
     rewrite /api/(.*) /$1 break;
     proxy_pass http://accounts:3000;

packages/dashboard-v2/gatsby-config.js

@@ -11,7 +11,7 @@ module.exports = {
     title: `Account Dashboard`,
     siteUrl: `https://account.${GATSBY_PORTAL_DOMAIN}`,
   },
-  pathPrefix: "/v2",
+  // pathPrefix: "/v2",
   trailingSlash: "never",
   plugins: [
     "gatsby-plugin-image",