From fb34a3c724592879914d94e29b0f685391ca8500 Mon Sep 17 00:00:00 2001 From: ihorkostrov Date: Mon, 16 Jan 2023 17:24:38 +0200 Subject: [PATCH] applied fixes for m1 --- src/.env | 10 +++++----- .../aggregator/Mobile.Shopping.HttpAggregator.csproj | 8 ++++---- .../aggregator/Web.Shopping.HttpAggregator.csproj | 10 +++++----- src/Services/Basket/Basket.API/Basket.API.csproj | 4 ++-- src/Services/Catalog/Catalog.API/Catalog.API.csproj | 4 ++-- src/Services/Ordering/Ordering.API/Ordering.API.csproj | 4 ++-- src/docker-compose-tests.yml | 2 +- src/docker-compose.windows.yml | 2 +- src/docker-compose.yml | 6 +++--- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/.env b/src/.env index 3aac89a3f..61fc1d012 100644 --- a/src/.env +++ b/src/.env @@ -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= @@ -32,4 +32,4 @@ ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.162 #ESHOP_AZURE_STORAGE_CATALOG_KEY= #ESHOP_SERVICE_BUS_USERNAME= #ESHOP_SERVICE_BUS_PASSWORD= -#INSTRUMENTATION_KEY= \ No newline at end of file +#INSTRUMENTATION_KEY= diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index 13c443025..e6e10a501 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index 921d5b709..1dd61a6bb 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -17,11 +17,11 @@ - - - - - + + + + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index ebb224824..4cead79e0 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index b78ce2af3..b18df9bdb 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -50,8 +50,8 @@ - - + + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 5d779ffc0..45f1400ec 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -46,8 +46,8 @@ - - + + diff --git a/src/docker-compose-tests.yml b/src/docker-compose-tests.yml index 82fee17db..8c200ed13 100644 --- a/src/docker-compose-tests.yml +++ b/src/docker-compose-tests.yml @@ -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 diff --git a/src/docker-compose.windows.yml b/src/docker-compose.windows.yml index 11ecfa3cd..e4c3b340b 100644 --- a/src/docker-compose.windows.yml +++ b/src/docker-compose.windows.yml @@ -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 diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 3ae5d431a..e1e16a629 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -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