Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 7cf90e0

Browse files
Merge pull request #2048 from erjain/fix/certificate-issue
commit to resolve RemoteCertificateValidationCallback issue
2 parents 3e991ac + 98e7e53 commit 7cf90e0

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/Services/Catalog/Catalog.API/web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="false" stdoutLogEnabled="false" hostingModel="inprocess">
88
<environmentVariables>
99
<environmentVariable name="COMPLUS_ForceENC" value="1" />
10-
<environmentVariable name="ConnectionString" value="server=localhost,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word" />
10+
<environmentVariable name="ConnectionString" value="server=localhost,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;TrustServerCertificate=true" />
1111
<environmentVariable name="Serilog:LogstashgUrl" value="http://locahost:8080" />
1212
<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
1313
<environmentVariable name="EventBusConnection" value="localhost" />

src/Services/Identity/Identity.API/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;Encrypt=False;",
2+
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true;",
33
"IsClusterEnv": "False",
44
"MvcClient": "http://localhost:5100",
55
"SpaClient": "http://localhost:5104",

src/Services/Ordering/Ordering.API/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
2+
"ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;TrustServerCertificate=true",
33
"IdentityUrl": "http://localhost:5105",
44
"UseCustomizationData": false,
55
"Serilog": {

src/Services/Webhooks/Webhooks.API/appsettings.Development.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"Microsoft": "Information"
77
}
88
},
9-
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"
9+
"ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;TrustServerCertificate=true"
1010
}

src/docker-compose.override.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
- ASPNETCORE_URLS=http://0.0.0.0:80
4545
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
4646
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
47-
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word;Encrypt=False}
47+
- ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
4848
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
4949
- BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
5050
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
@@ -82,7 +82,7 @@ services:
8282
catalog-api:
8383
environment:
8484
- ASPNETCORE_ENVIRONMENT=Development
85-
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;Encrypt=False}
85+
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
8686
- PicBaseUrl=${ESHOP_STORAGE_CATALOG_URL}
8787
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
8888
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -105,7 +105,7 @@ services:
105105
environment:
106106
- ASPNETCORE_ENVIRONMENT=Development
107107
- ASPNETCORE_URLS=http://0.0.0.0:80
108-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False}
108+
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
109109
- identityUrl=http://identity-api
110110
- IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
111111
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
@@ -130,7 +130,7 @@ services:
130130
environment:
131131
- ASPNETCORE_ENVIRONMENT=Development
132132
- ASPNETCORE_URLS=http://0.0.0.0:80
133-
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False}
133+
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
134134
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
135135
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
136136
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
@@ -164,7 +164,7 @@ services:
164164
environment:
165165
- ASPNETCORE_ENVIRONMENT=Development
166166
- ASPNETCORE_URLS=http://0.0.0.0:80
167-
- ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word;Encrypt=False}
167+
- ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word;Encrypt=False;TrustServerCertificate=true}
168168
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
169169
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
170170
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}

0 commit comments

Comments
 (0)