diff --git a/docker-compose.yaml b/docker-compose.yaml index a399891..ae0d24d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,30 +1,5 @@ services: -# keycloak: -# build: -# context: ./keycloak -# dockerfile: Dockerfile -# container_name: keycloak -# ports: -# - "8080:8080" -# environment: -# KC_ADMIN: admin -# KC_ADMIN_PASSWORD: admin -# PROXY_ADDRESS_FORWARDING: true -# KС_HTTPS_PORT: 8443 -# KС_HTTP_PORT: 8080 -# KС_LOGLEVEL: INFO -# KС_HTTP_PROXY: true -# KС_HTTPS_REDIRECT: false -# KC_HOSTNAME_STRICT: false -# KC_PROXY: passthrough -# KC_HTTP_ENABLED: true -# KC_HOSTNAME: yalarba.ru -# KC_HOSTNAME_STRICT_BACKCHANNEL: false -# KC_FRONTEND_URL: https://yalarba.ru/auth -# command: start --optimized -# networks: -# - internal # kk_db: # image: postgres:16 @@ -38,8 +13,6 @@ services: # networks: # - internal -volumes: - keycloak-postgres: networks: web-network: diff --git a/serv_keycloak/docker-compose.yaml b/serv_keycloak/docker-compose.yaml index 48be708..40329b9 100644 --- a/serv_keycloak/docker-compose.yaml +++ b/serv_keycloak/docker-compose.yaml @@ -1,5 +1,4 @@ services: - keycloak: build: context: ./keycloak @@ -23,3 +22,6 @@ services: KC_HOSTNAME_STRICT_BACKCHANNEL: false KC_FRONTEND_URL: https://yalarba.ru/auth command: start --optimized + +volumes: + keycloak-postgres: diff --git a/serv_postgres/.env b/serv_postgres/.env new file mode 100644 index 0000000..3f19719 --- /dev/null +++ b/serv_postgres/.env @@ -0,0 +1,9 @@ +# POSTGRESQL + +PGHOST=db +PGPORT=5432 +PGUSER=postgres +PGPASSWORD=postgres +PGDATABASE=postgres +SSLmode=disable +PGURL='postgres://postgres:postgres@db:5432/postgres?sslmode=disable' \ No newline at end of file diff --git a/serv_postgres/docker-compose.yaml b/serv_postgres/docker-compose.yaml new file mode 100644 index 0000000..e5dbcbc --- /dev/null +++ b/serv_postgres/docker-compose.yaml @@ -0,0 +1,18 @@ +services: + db: + image: postgres:16 + container_name: db + env_file: + - .env + ports: + - "${PGPORT}:${PGPORT}" + volumes: + - postgres-db:/var/lib/postgresql/data + environment: + - POSTGRES_USER=${PGUSER} + - POSTGRES_PASSWORD=${PGPASSWORD} + - POSTGRES_DB=${PGDATABASE} + restart: unless-stopped + +volumes: + postgres-db: diff --git a/serv_rest_api/.env b/serv_rest_api/.env index 5b40f53..fe392b2 100644 --- a/serv_rest_api/.env +++ b/serv_rest_api/.env @@ -4,12 +4,3 @@ SERVER_PORT=8000 SECRET_KEY=my_very_secret_key -# POSTGRESQL - -PGHOST=db -PGPORT=5432 -PGUSER=postgres -PGPASSWORD=postgres -PGDATABASE=postgres -SSLmode=disable -PGURL='postgres://postgres:postgres@db:5432/postgres?sslmode=disable' \ No newline at end of file diff --git a/serv_rest_api/docker-compose.yml b/serv_rest_api/docker-compose.yml index 9ba6863..1f974df 100644 --- a/serv_rest_api/docker-compose.yml +++ b/serv_rest_api/docker-compose.yml @@ -1,20 +1,4 @@ services: - - db: - image: postgres:16 - container_name: db - env_file: - - .env - ports: - - "${PGPORT}:${PGPORT}" - volumes: - - postgres-db:/var/lib/postgresql/data - environment: - - POSTGRES_USER=${PGUSER} - - POSTGRES_PASSWORD=${PGPASSWORD} - - POSTGRES_DB=${PGDATABASE} - restart: unless-stopped - api: container_name: api build: @@ -31,10 +15,5 @@ services: command: ./bin/api restart: unless-stopped - volumes: - postgres-db: api: - - - \ No newline at end of file