🐛 Fix launchpad

This commit is contained in:
2025-12-13 17:29:04 +08:00
parent 0d2f78b4e7
commit 4d164ff7bf
2 changed files with 13 additions and 7 deletions

View File

@@ -137,7 +137,7 @@ image = "${RING_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${RING_PORT}", "HTTP_PORTS=${RING_PORT}",
"HTTPS_PORTS=${RING_ALTPORT}", "GRPC_PORT=${RING_ALTPORT}",
"OTEL_SERVICE_NAME=ring", "OTEL_SERVICE_NAME=ring",
] ]
volumes = ["./keys:/app/keys", "./settings/ring.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/ring.json:/app/appsettings.json"]
@@ -159,7 +159,7 @@ image = "${PASS_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${PASS_PORT}", "HTTP_PORTS=${PASS_PORT}",
"HTTPS_PORTS=${PASS_ALTPORT}", "GRPC_PORT=${PASS_ALTPORT}",
"OTEL_SERVICE_NAME=pass", "OTEL_SERVICE_NAME=pass",
] ]
volumes = ["./keys:/app/keys", "./settings/pass.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/pass.json:/app/appsettings.json"]
@@ -181,7 +181,7 @@ image = "${SPHERE_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${SPHERE_PORT}", "HTTP_PORTS=${SPHERE_PORT}",
"HTTPS_PORTS=${SPHERE_ALTPORT}", "GRPC_PORT=${SPHERE_ALTPORT}",
"OTEL_SERVICE_NAME=sphere", "OTEL_SERVICE_NAME=sphere",
] ]
volumes = ["./keys:/app/keys", "./settings/sphere.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/sphere.json:/app/appsettings.json"]
@@ -203,7 +203,7 @@ image = "${DRIVE_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${DRIVE_PORT}", "HTTP_PORTS=${DRIVE_PORT}",
"HTTPS_PORTS=${DRIVE_ALTPORT}", "GRPC_PORT=${DRIVE_ALTPORT}",
"OTEL_SERVICE_NAME=drive", "OTEL_SERVICE_NAME=drive",
] ]
volumes = ["./keys:/app/keys", "./settings/drive.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/drive.json:/app/appsettings.json"]
@@ -225,7 +225,7 @@ image = "${DEVELOP_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${DEVELOP_PORT}", "HTTP_PORTS=${DEVELOP_PORT}",
"HTTPS_PORTS=${DEVELOP_ALTPORT}", "GRPC_PORT=${DEVELOP_ALTPORT}",
"OTEL_SERVICE_NAME=develop", "OTEL_SERVICE_NAME=develop",
] ]
volumes = ["./keys:/app/keys", "./settings/develop.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/develop.json:/app/appsettings.json"]
@@ -247,7 +247,7 @@ image = "${INSIGHT_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${INSIGHT_PORT}", "HTTP_PORTS=${INSIGHT_PORT}",
"HTTPS_PORTS=${INSIGHT_ALTPORT}", "GRPC_PORT=${INSIGHT_ALTPORT}",
"OTEL_SERVICE_NAME=insight", "OTEL_SERVICE_NAME=insight",
] ]
volumes = ["./keys:/app/keys", "./settings/insight.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/insight.json:/app/appsettings.json"]
@@ -269,7 +269,7 @@ image = "${ZONE_IMAGE}"
environment = [ environment = [
"ASPNETCORE_FORWARDEDHEADERS_ENABLED=true", "ASPNETCORE_FORWARDEDHEADERS_ENABLED=true",
"HTTP_PORTS=${ZONE_PORT}", "HTTP_PORTS=${ZONE_PORT}",
"HTTPS_PORTS=${ZONE_ALTPORT}", "GRPC_PORT=${ZONE_ALTPORT}",
"OTEL_SERVICE_NAME=zone", "OTEL_SERVICE_NAME=zone",
] ]
volumes = ["./keys:/app/keys", "./settings/zone.json:/app/appsettings.json"] volumes = ["./keys:/app/keys", "./settings/zone.json:/app/appsettings.json"]

View File

@@ -167,6 +167,12 @@ func startSourceService(ctx context.Context, s config.Service, color string) {
cmd := exec.CommandContext(ctx, parts[0], parts[1:]...) cmd := exec.CommandContext(ctx, parts[0], parts[1:]...)
cmd.Dir = s.Path cmd.Dir = s.Path
env := os.Environ()
for _, e := range s.Prod.Environment {
env = append(env, os.ExpandEnv(e))
}
cmd.Env = env
runAndMonitorCommand(ctx, cmd, s.Name, prefix) runAndMonitorCommand(ctx, cmd, s.Name, prefix)
} }