From 5e944fca1213a2195f8438d8339bed48523756a3 Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Sat, 21 Jun 2025 23:54:28 +0300 Subject: [PATCH] add profiles into dokcer-cmpse.ymal file --- Makefile | 7 +++++-- README.md | 4 ++++ docker-compose.yaml | 31 +++++++++++++++++++++++++++---- nginx/nginx-ssl.conf | 8 ++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 26df3f2..553d738 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ build: @docker compose build -run: stop - @docker compose up -d --remove-orphans +buildC: + @docker compose build --no-cache + +run: + @docker compose --profile dev up -d --remove-orphans stop: @docker compose down diff --git a/README.md b/README.md index 1eed635..3d254eb 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,7 @@ ## before start your need to set .env file with your VARIABLES ## build and start with command: make + + + +need to see conf for nginx and change link to keycloak diff --git a/docker-compose.yaml b/docker-compose.yaml index b8e2bba..711263f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,6 +3,8 @@ services: db: image: postgres:16 container_name: db + profiles: + - prod env_file: - .env ports: @@ -20,6 +22,8 @@ services: build: context: ./api dockerfile: Dockerfile + profiles: + - prod env_file: - .env ports: @@ -33,6 +37,8 @@ services: migrator: container_name: migrator + profiles: + - prod build: context: ./migrator dockerfile: Dockerfile @@ -47,6 +53,8 @@ services: spa: container_name: spa + profiles: + - prod build: context: ./spa dockerfile: Dockerfile @@ -57,6 +65,9 @@ services: build: context: ./nginx dockerfile: Dockerfile + profiles: + - prod + - dev env_file: .env container_name: nginx restart: unless-stopped @@ -69,6 +80,7 @@ services: - ./spa/app:/usr/share/nginx/html networks: - web-network + - internal depends_on: - certbot @@ -77,6 +89,9 @@ services: context: ./certbot dockerfile: Dockerfile container_name: certbot + profiles: + - prod + - dev volumes: - certbot_data:/etc/letsencrypt - certbot_www:/var/www/certbot @@ -90,23 +105,31 @@ services: keycloak: image: quay.io/keycloak/keycloak:latest + container_name: keycloak ports: - "8080:8080" + profiles: + - prod + - dev environment: KEYCLOAK_USER: admin KEYCLOAK_PASSWORD: admin DB_VENDOR: postgres - DB_ADDR: postgres # Имя сервиса PostgreSQL + DB_ADDR: kk_db # Имя сервиса PostgreSQL DB_DATABASE: keycloak DB_USER: postgres DB_PASSWORD: postgres depends_on: - - postgres + - kk_db networks: - internal - postgres: - image: postgres:latest + kk_db: + image: postgres:16 + container_name: kk_db + profiles: + - prod + - dev environment: POSTGRES_DB: keycloak POSTGRES_USER: postgres diff --git a/nginx/nginx-ssl.conf b/nginx/nginx-ssl.conf index 3221405..8cf41cf 100644 --- a/nginx/nginx-ssl.conf +++ b/nginx/nginx-ssl.conf @@ -22,4 +22,12 @@ server { root /usr/share/nginx/html; index index.html; } + + location /auth { + proxy_pass http://keycloak:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } }