diff --git a/production.yml_example b/docker-compose.override.yml_example similarity index 95% rename from production.yml_example rename to docker-compose.override.yml_example index 3b549b1c8c9f5a39ed893577587c876fc18963aa..d5839a931bdbdd1757f33308909518c7d038101e 100644 --- a/production.yml_example +++ b/docker-compose.override.yml_example @@ -44,11 +44,9 @@ services: ### copy nginx/ssl_certificates.conf_example and edit it ## if need be to correspond to the volume below ### and uncomment this block and the port 443 - # build: - # args: - # - NGINX_CONF=ssl.conf # volumes: - # - /etc/letsencrypt/live/<mydomain>:/etc/certs + # - ${PWD}/nginx/ssl.conf:/etc/nginx/conf.d/nginx.conf + # - ${PWD}/nginx/certs/:/etc/certs/ flower: restart: always @@ -86,7 +84,6 @@ services: # cpus: '6' # memory: 15g # reservations: - # cpus: '6' # memory: 4g celery-low-priority: @@ -102,7 +99,6 @@ services: # cpus: '2' # memory: 15g # reservations: - # cpus: '2' # memory: 1g celery-gpu: @@ -118,7 +114,6 @@ services: # cpus: '6' # memory: 15g # reservations: - # cpus: '2' # memory: 1g # shm_size: '3gb' diff --git a/docker-compose.yml b/docker-compose.yml index 30185ad359897b4a1e2712f5b757c401a74121b8..57df3735cd7b5f5da89b479dc21b0fb64f0ad7ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,7 @@ services: environment: - SERVERNAME=${DOMAIN:-localhost} volumes: + - ${PWD}/nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf - static:/usr/src/app/static - media:/usr/src/app/media ports: diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 8e1065fb4fd5b8eeff85c21a2a0ec44b0cdaf90f..ff0e36d8cb36615115d7ba41bac357e2cec1c9ff 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,7 +2,4 @@ FROM nginx:1.15.0-alpine RUN rm /etc/nginx/conf.d/default.conf -ARG NGINX_CONF=nginx.conf - -COPY ${NGINX_CONF} /etc/nginx/conf.d/nginx.conf COPY ssl_certificates.conf* /etc/nginx/conf.d/ diff --git a/variables.env_example b/variables.env_example index 326e1526abd8251ed5e8bc69fd3a47364c6d4e33..d5e67a5c0a32df4f3f4180b04dd8e90c23e7c389 100644 --- a/variables.env_example +++ b/variables.env_example @@ -1,18 +1,18 @@ DOMAIN=localhost SECRET_KEY=changeme -SQL_ENGINE=django.db.backends.postgresql -SQL_HOST=db -SQL_PORT=5432 -POSTGRES_USER=postgres -POSTGRES_PASSWORD=postgres -POSTGRES_DB=escriptorium -DATABASE=postgres + +# POSTGRES_USER=postgres +# POSTGRES_PASSWORD=postgres +# POSTGRES_DB=escriptorium + DJANGO_SU_NAME=admin DJANGO_SU_EMAIL=admin@admin.com DJANGO_SU_PASSWORD=admin DJANGO_FROM_EMAIL=noreply@mydomain.com -REDIS_HOST=redis + FLOWER_BASIC_AUTH=flower:changeme +# EMAIL_HOST=<hostname> + # set shm_size in yml file! KRAKEN_TRAINING_LOAD_THREADS=8