Merge remote-tracking branch 'origin/master' into dashboard-v2-stripe-test

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
+    build: https://github.com/SkynetLabs/skynet-accounts.git#main
+    # image: skynetlabs/skynet-accounts
     container_name: accounts
     restart: unless-stopped
     logging: *default-logging

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;

packages/dashboard-v2/src/services/skynetClient.js

@@ -1,3 +1,6 @@
 import { SkynetClient } from "skynet-js";
 
-export default new SkynetClient(`https://${process.env.GATSBY_PORTAL_DOMAIN}`);
+// In production-like environment, let SkynetClient figure out the best portal
+export default new SkynetClient(
+  process.env.NODE_ENV === "development" ? `https://${process.env.GATSBY_PORTAL_DOMAIN}` : undefined
+);