Browse Source

applied fixes for m1

pull/2038/head
ihorkostrov 2 years ago
parent
commit
fb34a3c724
9 changed files with 25 additions and 25 deletions
  1. +5
    -5
      src/.env
  2. +4
    -4
      src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
  3. +5
    -5
      src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
  4. +2
    -2
      src/Services/Basket/Basket.API/Basket.API.csproj
  5. +2
    -2
      src/Services/Catalog/Catalog.API/Catalog.API.csproj
  6. +2
    -2
      src/Services/Ordering/Ordering.API/Ordering.API.csproj
  7. +1
    -1
      src/docker-compose-tests.yml
  8. +1
    -1
      src/docker-compose.windows.yml
  9. +3
    -3
      src/docker-compose.yml

+ 5
- 5
src/.env View File

@ -5,16 +5,16 @@
# The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices
# Use this values to run the app locally in Windows
ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
# ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
# Use this values to run the app locally in Mac
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/c/api/v1/catalog/items/[0]/pic/
# Use this values to run the app locally in Linux
# ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
# Configure this values to the cloud storage locations
# ESHOP_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>
@ -32,4 +32,4 @@ ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.162
#ESHOP_AZURE_STORAGE_CATALOG_KEY=<YourAzureStorageCatalogKey>
#ESHOP_SERVICE_BUS_USERNAME=<ServiceBusUserName-OnlyUsedIfUsingRabbitMQUnderwindows>
#ESHOP_SERVICE_BUS_PASSWORD=<ServiceBusUserPassword-OnlyUsedIfUsingRabbitMQUnderwindows>
#INSTRUMENTATION_KEY=
#INSTRUMENTATION_KEY=

+ 4
- 4
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj View File

@ -17,10 +17,10 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.34.0" />
<PackageReference Include="Grpc.Core" Version="2.34.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0" />
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.42.0" />
<PackageReference Include="Grpc.Core" Version="2.44.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.2" />


+ 5
- 5
src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj View File

@ -17,11 +17,11 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.34.0" />
<PackageReference Include="Grpc.Core" Version="2.34.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.34.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0" />
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.42.0" />
<PackageReference Include="Grpc.Core" Version="2.44.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.42.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.2" />


+ 2
- 2
src/Services/Basket/Basket.API/Basket.API.csproj View File

@ -24,8 +24,8 @@
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.1" />
<PackageReference Include="Azure.Identity" Version="1.4.0" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.34.0" />
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.18.0" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.18.0" />
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="2.0.2-beta2" />


+ 2
- 2
src/Services/Catalog/Catalog.API/Catalog.API.csproj View File

@ -50,8 +50,8 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0-preview.1" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.34.0" />
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.18.0" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.18.0" />
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="2.0.2-beta2" />


+ 2
- 2
src/Services/Ordering/Ordering.API/Ordering.API.csproj View File

@ -46,8 +46,8 @@
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.3.0" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.34.0" />
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore.Server" Version="2.42.0" />
<PackageReference Include="Grpc.Tools" Version="2.44.0" PrivateAssets="All" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
<PackageReference Include="MediatR" Version="10.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.18.0" />


+ 1
- 1
src/docker-compose-tests.yml View File

@ -2,7 +2,7 @@ version: '3.4'
services:
sql-data-test:
image: mcr.microsoft.com/mssql/server:2019-latest
image: mcr.microsoft.com/azure-sql-edge:latest
nosql-data-test:
image: mongo


+ 1
- 1
src/docker-compose.windows.yml View File

@ -6,7 +6,7 @@ version: '3.4'
services:
sqldata:
image: mcr.microsoft.com/mssql/server:2019-latest
image: mcr.microsoft.com/azure-sql-edge:latest
nosqldata:
image: mongo:windowsservercore


+ 3
- 3
src/docker-compose.yml View File

@ -6,7 +6,7 @@ services:
image: datalust/seq:latest
sqldata:
image: mcr.microsoft.com/mssql/server:2019-latest
image: mcr.microsoft.com/azure-sql-edge:latest
nosqldata:
image: mongo
@ -79,7 +79,7 @@ services:
- sqldata
mobileshoppingapigw:
image: envoyproxy/envoy:v1.11.1
image: envoyproxy/envoy:v1.16.0
mobileshoppingagg:
image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
@ -158,4 +158,4 @@ services:
- webhooks-api
webshoppingapigw:
image: envoyproxy/envoy:v1.11.1
image: envoyproxy/envoy:v1.16.0

Loading…
Cancel
Save