🔨 Update build script

2025-09-24 20:22:11 +08:00
parent d9fe1273b5
commit 7bc94a9646
7 changed files with 2433 additions and 238 deletions
--- a/publish/.env
+++ b/publish/.env
@@ -33,3 +33,6 @@ SPHERE_IMAGE=sphere:latest

 # Container image name for develop
 DEVELOP_IMAGE=develop:latest
+
+# Container image name for gateway
+GATEWAY_IMAGE=gateway:latest
--- a/publish/docker-compose.yaml
+++ b/publish/docker-compose.yaml
@@ -39,16 +39,16 @@ services:
      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${RING_PORT}"
-      HTTPS_PORTS: "5001"
+      HTTP_PORTS: "8080"
+      HTTPS_PORTS: "7001"
      ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222"
-      services__pass__http__0: "http://pass:${PASS_PORT}"
+      services__pass__http__0: "http://pass:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "ring"
    expose:
-      - "${RING_PORT}"
-      - "5001"
+      - "8080"
+      - "7001"
    networks:
      - "aspire"
  pass:
@@ -58,17 +58,17 @@ services:
      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${PASS_PORT}"
-      HTTPS_PORTS: "5001"
+      HTTP_PORTS: "8080"
+      HTTPS_PORTS: "7001"
      ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}"
      ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222"
-      services__ring__http__0: "http://ring:${RING_PORT}"
+      services__ring__http__0: "http://ring:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "pass"
    expose:
-      - "${PASS_PORT}"
-      - "5001"
+      - "8080"
+      - "7001"
    networks:
      - "aspire"
  drive:
@@ -78,18 +78,18 @@ services:
      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${DRIVE_PORT}"
-      HTTPS_PORTS: "5001"
+      HTTP_PORTS: "8080"
+      HTTPS_PORTS: "7001"
      ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}"
      ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222"
-      services__pass__http__0: "http://pass:${PASS_PORT}"
-      services__ring__http__0: "http://ring:${RING_PORT}"
+      services__pass__http__0: "http://pass:8080"
+      services__ring__http__0: "http://ring:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "drive"
    expose:
-      - "${DRIVE_PORT}"
-      - "5001"
+      - "8080"
+      - "7001"
    networks:
      - "aspire"
  sphere:
@@ -99,19 +99,19 @@ services:
      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${SPHERE_PORT}"
-      HTTPS_PORTS: "5001"
+      HTTP_PORTS: "8080"
+      HTTPS_PORTS: "7001"
      ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}"
      ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222"
-      services__pass__http__0: "http://pass:${PASS_PORT}"
-      services__ring__http__0: "http://ring:${RING_PORT}"
-      services__drive__http__0: "http://drive:${DRIVE_PORT}"
+      services__pass__http__0: "http://pass:8080"
+      services__ring__http__0: "http://ring:8080"
+      services__drive__http__0: "http://drive:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "sphere"
    expose:
-      - "${SPHERE_PORT}"
-      - "5001"
+      - "8080"
+      - "7001"
    networks:
      - "aspire"
  develop:
@@ -121,70 +121,37 @@ services:
      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
-      HTTP_PORTS: "${DEVELOP_PORT}"
-      HTTPS_PORTS: "5001"
+      HTTP_PORTS: "8080"
+      HTTPS_PORTS: "7001"
      ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}"
-      services__pass__http__0: "http://pass:${PASS_PORT}"
-      services__ring__http__0: "http://ring:${RING_PORT}"
+      services__pass__http__0: "http://pass:8080"
+      services__ring__http__0: "http://ring:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "develop"
    expose:
-      - "${DEVELOP_PORT}"
-      - "5001"
+      - "8080"
+      - "7001"
    networks:
      - "aspire"
  gateway:
-    image: "mcr.microsoft.com/dotnet/nightly/yarp:2.3.0-preview.4"
-    command:
-      - "/app/yarp.dll"
-    entrypoint:
-      - "dotnet"
+    image: "${GATEWAY_IMAGE}"
    environment:
-      ASPNETCORE_ENVIRONMENT: "Production"
-      services__ring__http__0: "http://ring:${RING_PORT}"
-      REVERSEPROXY__ROUTES__route0__MATCH__PATH: "/ws"
-      REVERSEPROXY__ROUTES__route0__CLUSTERID: "cluster_ring"
-      REVERSEPROXY__ROUTES__route1__MATCH__PATH: "/ring/{**catch-all}"
-      REVERSEPROXY__ROUTES__route1__CLUSTERID: "cluster_ring"
-      REVERSEPROXY__ROUTES__route1__TRANSFORMS__0__PathRemovePrefix: "/ring"
-      REVERSEPROXY__ROUTES__route1__TRANSFORMS__1__PathPrefix: "/api"
-      REVERSEPROXY__ROUTES__route2__MATCH__PATH: "/.well-known/openid-configuration"
-      REVERSEPROXY__ROUTES__route2__CLUSTERID: "cluster_pass"
-      REVERSEPROXY__ROUTES__route3__MATCH__PATH: "/.well-known/jwks"
-      REVERSEPROXY__ROUTES__route3__CLUSTERID: "cluster_pass"
-      REVERSEPROXY__ROUTES__route4__MATCH__PATH: "/id/{**catch-all}"
-      REVERSEPROXY__ROUTES__route4__CLUSTERID: "cluster_pass"
-      REVERSEPROXY__ROUTES__route4__TRANSFORMS__0__PathRemovePrefix: "/id"
-      REVERSEPROXY__ROUTES__route4__TRANSFORMS__1__PathPrefix: "/api"
-      REVERSEPROXY__ROUTES__route5__MATCH__PATH: "/api/tus"
-      REVERSEPROXY__ROUTES__route5__CLUSTERID: "cluster_drive"
-      REVERSEPROXY__ROUTES__route6__MATCH__PATH: "/drive/{**catch-all}"
-      REVERSEPROXY__ROUTES__route6__CLUSTERID: "cluster_drive"
-      REVERSEPROXY__ROUTES__route6__TRANSFORMS__0__PathRemovePrefix: "/drive"
-      REVERSEPROXY__ROUTES__route6__TRANSFORMS__1__PathPrefix: "/api"
-      REVERSEPROXY__ROUTES__route7__MATCH__PATH: "/sphere/{**catch-all}"
-      REVERSEPROXY__ROUTES__route7__CLUSTERID: "cluster_sphere"
-      REVERSEPROXY__ROUTES__route7__TRANSFORMS__0__PathRemovePrefix: "/sphere"
-      REVERSEPROXY__ROUTES__route7__TRANSFORMS__1__PathPrefix: "/api"
-      REVERSEPROXY__ROUTES__route8__MATCH__PATH: "/develop/{**catch-all}"
-      REVERSEPROXY__ROUTES__route8__CLUSTERID: "cluster_develop"
-      REVERSEPROXY__ROUTES__route8__TRANSFORMS__0__PathRemovePrefix: "/develop"
-      REVERSEPROXY__ROUTES__route8__TRANSFORMS__1__PathPrefix: "/api"
-      REVERSEPROXY__CLUSTERS__cluster_ring__DESTINATIONS__destination1__ADDRESS: "http://_http.ring"
-      REVERSEPROXY__CLUSTERS__cluster_pass__DESTINATIONS__destination1__ADDRESS: "http://_http.pass"
-      REVERSEPROXY__CLUSTERS__cluster_drive__DESTINATIONS__destination1__ADDRESS: "http://_http.drive"
-      REVERSEPROXY__CLUSTERS__cluster_sphere__DESTINATIONS__destination1__ADDRESS: "http://_http.sphere"
-      REVERSEPROXY__CLUSTERS__cluster_develop__DESTINATIONS__destination1__ADDRESS: "http://_http.develop"
-      services__pass__http__0: "http://pass:${PASS_PORT}"
-      services__drive__http__0: "http://drive:${DRIVE_PORT}"
-      services__sphere__http__0: "http://sphere:${SPHERE_PORT}"
-      services__develop__http__0: "http://develop:${DEVELOP_PORT}"
+      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "true"
+      OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true"
+      OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory"
+      ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
+      HTTP_PORTS: "5001"
+      services__ring__http__0: "http://ring:8080"
+      services__pass__http__0: "http://pass:8080"
+      services__drive__http__0: "http://drive:8080"
+      services__sphere__http__0: "http://sphere:8080"
+      services__develop__http__0: "http://develop:8080"
      OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889"
      OTEL_EXPORTER_OTLP_PROTOCOL: "grpc"
      OTEL_SERVICE_NAME: "gateway"
    expose:
-      - "5000"
+      - "5001"
    networks:
      - "aspire"
 networks: