From 185b45c432fbceeff3a9c907bf24a9d7520f7146 Mon Sep 17 00:00:00 2001 From: Kamil Oberaj Date: Sat, 25 May 2024 14:59:42 +0200 Subject: [PATCH 1/2] [FIX]: docker-compose --- docker-compose.yml | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c9c6481..8520373 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: P@ssw0rd - POSTGRES_MULTIPLE_DATABASES: StudioManager,Keycloak + POSTGRES_MULTIPLE_DATABASES: StudioManager #,Keycloak healthcheck: test: 'pg_isready -U postgres --dbname=StudioManager' interval: 10s @@ -23,31 +23,31 @@ #### KEYCLOAK #### - studiomanager.keycloak: - image: quay.io/keycloak/keycloak:latest - container_name: studiomanager.keycloak - command: [ "start-dev", "--import-realm" ] - environment: - #KC_LOG_LEVEL: debug - KC_DB_VENDOR: postgres - KC_DB_ADDR: studiomanager.database - KC_DB_DATABASE: Keycloak - KC_DB_USER: postgres - KC_DB_PASSWORD: P@ssw0rd - - KEYCLOAK_ADMIN: admin - KEYCLOAK_ADMIN_PASSWORD: admin - ports: - - 8080:8080 - - 8443:8443 - links: - - studiomanager.database - depends_on: - studiomanager.database: - condition: service_started - volumes: - - ./.containers/realm.json:/opt/keycloak/data/import/realm.json:r - restart: unless-stopped +# studiomanager.keycloak: +# image: quay.io/keycloak/keycloak:latest +# container_name: studiomanager.keycloak +# command: [ "start-dev", "--import-realm" ] +# environment: +# #KC_LOG_LEVEL: debug +# KC_DB_VENDOR: postgres +# KC_DB_ADDR: studiomanager.database +# KC_DB_DATABASE: Keycloak +# KC_DB_USER: postgres +# KC_DB_PASSWORD: P@ssw0rd +# +# KEYCLOAK_ADMIN: admin +# KEYCLOAK_ADMIN_PASSWORD: admin +# ports: +# - 8080:8080 +# - 8443:8443 +# links: +# - studiomanager.database +# depends_on: +# studiomanager.database: +# condition: service_started +# volumes: +# - ./.containers/realm.json:/opt/keycloak/data/import/realm.json:r +# restart: unless-stopped #### API #### @@ -55,13 +55,13 @@ image: ${DOCKER_REGISTRY-}studiomanager.api container_name: studiomanager.api depends_on: - studiomanager.keycloak: - condition: service_started +# studiomanager.keycloak: +# condition: service_started studiomanager.database: condition: service_started links: - studiomanager.database - - studiomanager.keycloak +# - studiomanager.keycloak build: context: . dockerfile: StudioManager.API/Dockerfile From e26f2629bda2878aba3a1be003bdd2931697b19c Mon Sep 17 00:00:00 2001 From: Kamil Oberaj Date: Sat, 25 May 2024 19:33:01 +0200 Subject: [PATCH 2/2] [feat]: new port --- StudioManager.API/Properties/launchSettings.json | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/StudioManager.API/Properties/launchSettings.json b/StudioManager.API/Properties/launchSettings.json index 0bbc8e1..c8e19e2 100644 --- a/StudioManager.API/Properties/launchSettings.json +++ b/StudioManager.API/Properties/launchSettings.json @@ -6,7 +6,7 @@ "dotnetRunMessages": true, "launchBrowser": false, "launchUrl": "swagger", - "applicationUrl": "https://localhost:5000;https://localhost:5001", + "applicationUrl": "https://localhost:5450;https://localhost:5451", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Local" } diff --git a/docker-compose.yml b/docker-compose.yml index 8520373..50409d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,8 +66,8 @@ context: . dockerfile: StudioManager.API/Dockerfile ports: - - 5000:5000 - - 5001:5001 + - 5450:5450 + - 5451:5451 environment: - - ASPNETCORE_URLS=http://+:5001 + - ASPNETCORE_URLS=http://+:5451 restart: unless-stopped