From 0b77c372105ce501d47d76607dbd6f66eeae29c9 Mon Sep 17 00:00:00 2001 From: "caner.izci" Date: Sat, 17 Jun 2023 00:18:59 +0300 Subject: [PATCH] update docker-compose files for m1 chip compatibility --- src/.env | 4 ++-- src/docker-compose-tests.yml | 2 +- src/docker-compose.override.yml | 4 ++-- src/docker-compose.windows.yml | 2 +- src/docker-compose.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/.env b/src/.env index 6a3254999..5acc34523 100644 --- a/src/.env +++ b/src/.env @@ -9,8 +9,8 @@ ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5121/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:5121/c/api/v1/catalog/items/[0]/pic/ +ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost +ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5121/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 diff --git a/src/docker-compose-tests.yml b/src/docker-compose-tests.yml index 82fee17db..95913cfee 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.override.yml b/src/docker-compose.override.yml index 086804125..fb6ef3e7a 100644 --- a/src/docker-compose.override.yml +++ b/src/docker-compose.override.yml @@ -277,7 +277,7 @@ services: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 - PurchaseUrl=http://webshoppingagg - - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 + - IdentityUrl=http://docker.for.mac.localhost:5105 - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121 - IdentityUrlHC=http://identity-api/hc - UseCustomizationData=True @@ -291,7 +291,7 @@ services: environment: - ASPNETCORE_URLS=http://0.0.0.0:80 - Token=6168DB8D-DC58-4094-AF24-483278923590 # Webhooks are registered with this token (any value is valid) but the client won't check it - - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 + - IdentityUrl=http://docker.for.mac.localhost:5105 - CallBackUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5114 - WebhooksUrl=http://webhooks-api - SelfUrl=http://webhooks-client/ diff --git a/src/docker-compose.windows.yml b/src/docker-compose.windows.yml index 11ecfa3cd..ef3210394 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 2d919945c..010fc4069 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