Remove variable defaults

These are not set whenever a merged compose file is used

docker-compose.development.yml

@@ -5,6 +5,8 @@ volumes:
   node-modules:
 
 services:
+  db:
+    env_file: ./.development.env
   celery:
     env_file: ./.development.env
     environment:
@@ -15,12 +17,12 @@ services:
   django:
     build:
       target: development
-    command: python /app/src/manage.py runserver 0.0.0.0:${DJANGO_PORT:-8000}
+    command: python /app/src/manage.py runserver 0.0.0.0:8000
     env_file: ./.development.env
     environment:
       - DJANGO_SETTINGS_MODULE=newsreader.conf.docker
     ports:
-      - "${DJANGO_PORT:-8000}:${DJANGO_PORT:-8000}"
+      - "${DJANGO_PORT:-8000}:8000"
     volumes:
       - ./src:/app/src
       - static-files:/app/src/newsreader/static

docker-compose.production.yml

@@ -9,6 +9,9 @@ services:
     depends_on:
       django:
         condition: service_healthy
+    ports:
+      - "${NGINX_HTTP_PORT:-80}:80"
+      - "${NGINX_HTTPS_PORT:-443}:443"
     volumes:
       - ./config/nginx/conf.d:/etc/nginx/conf.d
       - logs:/var/log/nginx

docker-compose.yml

@@ -13,10 +13,6 @@ services:
       interval: 5s
       timeout: 10s
       retries: 10
-    environment:
-      POSTGRES_DB: "${POSTGRES_DB:-newsreader}"
-      POSTGRES_USER: "${POSTGRES_USER:-newsreader}"
-      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-newsreader}"
     volumes:
       - postgres-data:/var/lib/postgresql/data
 
@@ -65,11 +61,11 @@ services:
     entrypoint: /app/bin/docker-entrypoint.sh
     command: |
       gunicorn
-      --bind 0.0.0.0:${DJANGO_PORT:-8000}
+      --bind 0.0.0.0:8000
       --workers 3
       newsreader.wsgi:application
     healthcheck:
-      test: /usr/bin/curl --fail http://django:${DJANGO_PORT:-8000} || exit 1
+      test: /usr/bin/curl --fail http://django:8000 || exit 1
       interval: 30s
       timeout: 10s
       retries: 10