From 44c4cc8c55c9034d887c1ba5c0c58cc6a509dcde Mon Sep 17 00:00:00 2001 From: wzh425 Date: Fri, 8 Mar 2024 15:16:08 +0800 Subject: [PATCH] chore: Dockerfile --- .../Masa.Auth.Contracts.Admin.csproj | 3 ++- src/Services/Masa.Auth.Service.Admin/Dockerfile | 2 +- .../Masa.Auth.Security.OAuth.Providers.csproj | 2 +- src/Web/Masa.Auth.Web.Admin.Server/Dockerfile | 2 +- src/Web/Masa.Auth.Web.Sso/Dockerfile | 2 +- src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Contracts/Masa.Auth.Contracts.Admin/Masa.Auth.Contracts.Admin.csproj b/src/Contracts/Masa.Auth.Contracts.Admin/Masa.Auth.Contracts.Admin.csproj index 9013d31a3..f5a976063 100644 --- a/src/Contracts/Masa.Auth.Contracts.Admin/Masa.Auth.Contracts.Admin.csproj +++ b/src/Contracts/Masa.Auth.Contracts.Admin/Masa.Auth.Contracts.Admin.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/Services/Masa.Auth.Service.Admin/Dockerfile b/src/Services/Masa.Auth.Service.Admin/Dockerfile index ca1123148..146d7f291 100644 --- a/src/Services/Masa.Auth.Service.Admin/Dockerfile +++ b/src/Services/Masa.Auth.Service.Admin/Dockerfile @@ -4,7 +4,7 @@ FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:6.0.403 AS publish WORKDIR /src COPY . . ENV CSPROJ="src/Services/Masa.Auth.Service.Admin/Masa.Auth.Service.Admin.csproj" -RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish +RUN dotnet restore $CSPROJ -s "http://devops.lonsid.cn:8080/nuget;https://nuget.cdn.azure.cn/v3/index.json" && dotnet publish $CSPROJ -c Release -o /app/publish FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:6.0.4 diff --git a/src/Web/Masa.Auth.Security.OAuth.Providers/Masa.Auth.Security.OAuth.Providers.csproj b/src/Web/Masa.Auth.Security.OAuth.Providers/Masa.Auth.Security.OAuth.Providers.csproj index f7f428966..d2509e9b8 100644 --- a/src/Web/Masa.Auth.Security.OAuth.Providers/Masa.Auth.Security.OAuth.Providers.csproj +++ b/src/Web/Masa.Auth.Security.OAuth.Providers/Masa.Auth.Security.OAuth.Providers.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Web/Masa.Auth.Web.Admin.Server/Dockerfile b/src/Web/Masa.Auth.Web.Admin.Server/Dockerfile index 8fb5345fe..fc6dce707 100644 --- a/src/Web/Masa.Auth.Web.Admin.Server/Dockerfile +++ b/src/Web/Masa.Auth.Web.Admin.Server/Dockerfile @@ -16,7 +16,7 @@ FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:6.0.403 AS publish WORKDIR /src COPY . . ENV CSPROJ="src/Web/Masa.Auth.Web.Admin.Server/Masa.Auth.Web.Admin.Server.csproj" -RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish +RUN dotnet restore $CSPROJ -s "http://devops.lonsid.cn:8080/nuget;https://nuget.cdn.azure.cn/v3/index.json" && dotnet publish $CSPROJ -c Release -o /app/publish FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:6.0.4 WORKDIR /app diff --git a/src/Web/Masa.Auth.Web.Sso/Dockerfile b/src/Web/Masa.Auth.Web.Sso/Dockerfile index be0455e4b..d40642e1e 100644 --- a/src/Web/Masa.Auth.Web.Sso/Dockerfile +++ b/src/Web/Masa.Auth.Web.Sso/Dockerfile @@ -2,7 +2,7 @@ FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:6.0.403 AS publish WORKDIR /src COPY . . ENV CSPROJ="src/Web/Masa.Auth.Web.Sso/Masa.Auth.Web.Sso.csproj" -RUN dotnet restore $CSPROJ && dotnet publish $CSPROJ -c Release -o /app/publish +RUN dotnet restore $CSPROJ -s "http://devops.lonsid.cn:8080/nuget;https://nuget.cdn.azure.cn/v3/index.json" && dotnet publish $CSPROJ -c Release -o /app/publish FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:6.0.4 WORKDIR /app diff --git a/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json b/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json index a1b5eb942..8743700f3 100644 --- a/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json +++ b/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json @@ -23,8 +23,8 @@ "MASA_NAMESPACE": "masastack", "MASA_CLUSTER": "Default", "OTLP_URL": "https://otel-collector.masastack:9013", - "REDIS": "{\"RedisHost\": \"10.130.0.235\", \"RedisPort\": 24615, \"RedisDb\": 0,\"RedisPassword\": \"Hzss@123\"}", - "CONNECTIONSTRING": "{\"Server\": \"10.130.0.235\", \"Port\": 24878,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}", + "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}", + "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}", "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]", "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}", "MASA_ENVIRONMENT": "Development",