Use more enviroment variables

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.6'
+version: "3.6"
 
 volumes:
   logs:
@@ -14,9 +14,9 @@ services:
       timeout: 10s
       retries: 10
     environment:
-      POSTGRES_DB: 'newsreader'
-      POSTGRES_USER: 'newsreader'
-      POSTGRES_PASSWORD: 'newsreader'
+      POSTGRES_DB: "${POSTGRES_DB:-newsreader}"
+      POSTGRES_USER: "${POSTGRES_USER:-newsreader}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-newsreader}"
     volumes:
       - postgres-data:/var/lib/postgresql/data
 
@@ -25,8 +25,6 @@ services:
 
   memcached:
     image: memcached:1.6
-    ports:
-      - '11211:11211'
     entrypoint:
       - memcached
       - -m 64
@@ -36,7 +34,8 @@ services:
       context: .
       dockerfile: ./docker/django
     command: |
-      celery worker -n worker1@%h
+      celery worker
+      -n worker1@%h
       -n worker2@%h
       --app newsreader
       --loglevel INFO
@@ -64,16 +63,18 @@ services:
       dockerfile: ./docker/django
       target: production
     entrypoint: /app/bin/docker-entrypoint.sh
-    command: gunicorn --bind 0.0.0.0:8000 --workers 3 newsreader.wsgi:application
+    command: |
+      gunicorn
+      --bind 0.0.0.0:${DJANGO_PORT:-8000}
+      --workers 3
+      newsreader.wsgi:application
     healthcheck:
-      test: /usr/bin/curl --fail http://django:8000 || exit 1
+      test: /usr/bin/curl --fail http://django:${DJANGO_PORT:-8000} || exit 1
       interval: 30s
       timeout: 10s
       retries: 10
     environment:
       - DJANGO_SETTINGS_MODULE=newsreader.conf.production
-    ports:
-      - '8000:8000'
     depends_on:
       memcached:
         condition: service_started