diff --git a/Makefile b/Makefile index 553d738..25ba33f 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ build: - @docker compose build + @docker compose --profile dev build buildC: - @docker compose build --no-cache + @docker compose --profile dev build --no-cache -run: +run: stop @docker compose --profile dev up -d --remove-orphans stop: - @docker compose down + @docker compose --profile dev down clean: - @docker builder prune + @docker builder --profile dev prune test: @go test ./api/src/auth/... -v diff --git a/docker-compose.yaml b/docker-compose.yaml index 711263f..0149b59 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -112,13 +112,16 @@ services: - prod - dev environment: - KEYCLOAK_USER: admin - KEYCLOAK_PASSWORD: admin + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin + KC_HOSTNAME: localhost DB_VENDOR: postgres DB_ADDR: kk_db # Имя сервиса PostgreSQL DB_DATABASE: keycloak DB_USER: postgres DB_PASSWORD: postgres + KC_HTTP_ENABLED: "true" + command: start-dev depends_on: - kk_db networks: