From 2f6a158e81ff18ef58a7cbd5dbb1a5ca8104be88 Mon Sep 17 00:00:00 2001
From: Andros Fenollosa <andros.fenollosa@ccstech.io>
Date: Fri, 21 Jul 2023 07:37:32 +0000
Subject: [PATCH] Update docker-compose.yaml

---
 docker-compose.yaml | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 389f31f..1147583 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,28 +22,8 @@ services:
     entrypoint: /django-launcher.sh
     volumes:
       - .:/usr/src/app/
-    environment:
-      DEBUG: "False"
-      ALLOWED_HOSTS: ${DOMAIN}
-      SECRET_KEY: ${DJANGO_SECRET_KEY}
-      DB_NAME:  ${DB_NAME}
-      DB_USER: ${DB_USER}
-      DB_PASSWORD: ${DB_PASSWORD}
-      DB_HOST: ${DB_HOST}
-      DB_PORT: ${DB_PORT}
-      DOMAIN: ${DOMAIN}
-      DOMAIN_URL:  ${DOMAIN_URL}
-      STATIC_URL: /static/
-      STATIC_ROOT: static
-      MEDIA_URL: /media/
-      REDIS_URI: ${REDIS_URI}
-      REDIS_PORT: ${REDIS_PORT}
-      EMAIL_HOST: ${EMAIL_HOST}
-      EMAIL_USE_TLS: ${EMAIL_USE_TLS}
-      EMAIL_USE_SSL: ${EMAIL_USE_SSL}
-      EMAIL_PORT: ${EMAIL_PORT}
-      EMAIL_USER: ${EMAIL_USER}
-      EMAIL_PASSWORD: ${EMAIL_PASSWORD}
+    env_file:
+      - .env
     expose:
       - 8000
     depends_on:
@@ -56,8 +36,8 @@ services:
     container_name: ${PROJECT_NAME}-caddy
     restart: "no"
     ports:
-        - ${CADDY_PORT_ONE}:80
-        - ${CADDY_PORT_TWO}:443
+        - ${CADDY_PORT_HTTP}:80
+        - ${CADDY_PORT_HTTPS}:443
     volumes:
         - ./Caddyfile.dev:/etc/caddy/Caddyfile
         - ./caddy_data:/data