From 7bb253febf4c8295d3bc3350bda673cccd2c8a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= Date: Wed, 13 Nov 2019 21:53:05 +0100 Subject: [PATCH] Aktualizace vzoroveho docker-compose --- docker-compose.sample.yml | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml index a9f9d69..03f6b26 100644 --- a/docker-compose.sample.yml +++ b/docker-compose.sample.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3.4' services: nginx: image: nginx:latest @@ -7,21 +7,40 @@ services: - "80:8001" volumes: - ./deploy/nginx:/etc/nginx/conf.d - - vol_static_nalodeni:/static_nalodeni + - nalodeni_static:/static_nalodeni depends_on: - nalodeni + nalodeni: - build: . + image: docker-registry.pirati.cz/to/nalodeni.pirati.cz:master container_name: nalodeni - command: bash -c "/nalodeni/docker-entrypoint.sh" volumes: - - vol_static_nalodeni:/nalodeni/static_files + - nalodeni_static:/nalodeni/static_files ports: - "8000" environment: - - NALODENI_DEBUG=off - - NALODENI_DEBUG_LOCAL=off - - + - NALODENI_DEBUG=b-off + - NALODENI_DEBUG_LOCAL=b-off + - NALODENI_BASE_SUBDOMAIN=s-nalodeni. + - NALODENI_BASE_DOMAIN=s-pirati.cz + - NALODENI_APP_REG_LIMIT_HARD=s-10000 + - NALODENI_APP_REG_LIMIT_SOFT=s-50 + - NALODENI_HTTP_PROTOCOL=s-https + - NALODENI_EMAIL_HOST=s-mailgate.pirati.cz + - NALODENI_EMAIL_HOST_USER=s-nalodeni@pirati.cz + - NALODENI_EMAIL_HOST_PASSWORD=s-XXXXXXXXXXXXXXXXX + - NALODENI_EMAIL_PORT=s-587 + - NALODENI_EMAIL_USE_TLS=b-on + - NALODENI_TOKEN_VALID_SEC=s-604800 + - NALODENI_PSQL_USER=s-nalodeni + - NALODENI_PSQL_HOST=s-10.42.0.11 + - NALODENI_PSQL_DBNAME=s-nalodeni + - NALODENI_PSQL_PASSWORD=s-XXXXXXXXXXXXXXXXXXXXX + - NALODENI_AUTH_AVAIL_IDP=a-pirati,facebook,twitter,google + - NALODENI_AUTH_CLIENT_ID=s-pirati-nalodeni + - NALODENI_AUTH_SERVER=s-https://auth.pirati.cz/auth/realms/pirati/ + - NALODENI_AUTH_CLIENT_SECRET=s-XXXXXXXXXXXXXXXXXXXX volumes: - vol_static_nalodeni: + nalodeni_static: + +