Merge branch 'nuxt-refactor' into nuxt-refactor-frontend

.docker/docker-compose.yml

@@ -4,18 +4,22 @@ services:
   mailpit:
     image: axllent/mailpit
     restart: unless-stopped
+    networks:
+      - net
     ports:
       - 8025:8025 # Web port
       - 1025:1025 # SMTP port
   mongo:
     image: mongo:8.0
     restart: unless-stopped
+    networks:
+      - net
     command: ["--replSet", "rs0", "--bind_ip_all", "--port", "27017"]
     ports:
       - 27017:27017 # MongoDB port
     # This funky stuff is needed for making a replicaset
     healthcheck:
-      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'host.docker.internal:27017'}]}) }" | mongosh --port 27017 --quiet
+      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'mongo:27017'}]}) }" | mongosh --port 27017 --quiet
       interval: 5s
       timeout: 30s
       start_period: 0s
@@ -23,11 +27,11 @@ services:
       retries: 30
     volumes:
       - "mongo_data:/data/db"
-      - "mongo_config:/data/configdb"
   garage:
     image: dxflrs/garage:v2.3.0
     restart: unless-stopped
-    networks: [net]
+    networks:
+      - net
     ports:
       - "3900:3900" # S3 API port
       - "3902:3902" # Web port
@@ -60,6 +64,8 @@ services:
   account:
     image: ghcr.io/pretendonetwork/account:sha-edb4b02
     restart: unless-stopped
+    networks:
+      - net
     ports:
       - "8123:8123" # grpc
       - "8056:8056" # http
@@ -67,13 +73,13 @@ services:
       PN_ACT_CONFIG_HTTP_PORT: 8056
       PN_ACT_CONFIG_GRPC_PORT: 8123
       PN_ACT_CONFIG_MONGO_CONNECTION_STRING: "mongodb://mongo:27017/account?directConnection=true"
-      PN_ACT_CONFIG_S3_ENDPOINT: "http://localhost:3900"
+      PN_ACT_CONFIG_S3_ENDPOINT: "http://garage:3900"
       PN_ACT_CONFIG_S3_REGION: "garage"
       PN_ACT_CONFIG_S3_BUCKET: "pretendo"
       PN_ACT_CONFIG_S3_ACCESS_KEY: "GK3515373e4c851ebaad366558"
       PN_ACT_CONFIG_S3_ACCESS_SECRET: "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34"
       PN_ACT_CONFIG_S3_FORCE_PATH_STYLE: "true"
-      PN_ACT_CONFIG_CDN_BASE_URL: "http://localhost:3902/pretendo"
+      PN_ACT_CONFIG_CDN_BASE_URL: "http://pretendo.localhost:3902/"
       PN_ACT_CONFIG_AES_KEY: "1234567812345678123456781234567812345678123456781234567812345678"
       PN_ACT_CONFIG_GRPC_MASTER_API_KEY_ACCOUNT: "12345678123456781234567812345678"
       PN_ACT_CONFIG_GRPC_MASTER_API_KEY_API: "12345678123456781234567812345678"
@@ -83,5 +89,4 @@ networks:
 
 volumes:
   mongo_data:
-  mongo_config:
   garage_data: