Merge branch 'develop'

production.yml_example → 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'

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:

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/

variables.env_example

 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