Clean up Docker Compose files

Author: n-thumann

docker-compose.dev.yml

@@ -18,13 +18,12 @@ services:
 
   redis:
     image: "redis:alpine"
-    hostname: redis
+    restart: always
     networks:
       - rengine_network
 
   celery:
-    build:
-      context: ./web
+    build: ./web
     image: yogeshojha/rengine:master
     restart: always
     entrypoint: /usr/src/app/celery-entrypoint.sh
@@ -55,10 +54,9 @@ services:
   celery-beat:
     build: ./web
     image: yogeshojha/rengine:master
+    restart: always
     entrypoint: /usr/src/app/beat-entrypoint.sh
     command: celery -A reNgine beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
-    environment:
-      - DEBUG=1
     depends_on:
       - celery
     environment:
@@ -82,8 +80,7 @@ services:
       - rengine_network
 
   web:
-    build:
-      context: ./web
+    build: ./web
     entrypoint: /usr/src/app/entrypoint.sh
     restart: always
     image: yogeshojha/rengine:master

docker-compose.yml

@@ -9,22 +9,20 @@ services:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_PORT=${POSTGRES_PORT}
-    ports:
-      - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     networks:
       - rengine_network
 
   redis:
     image: "redis:alpine"
+    restart: always
     hostname: redis
     networks:
       - rengine_network
 
   celery:
-    build:
-      context: ./web
+    build: ./web
     image: yogeshojha/rengine:master
     restart: always
     entrypoint: /usr/src/app/celery-entrypoint.sh
@@ -56,6 +54,7 @@ services:
   celery-beat:
     build: ./web
     image: yogeshojha/rengine:master
+    restart: always
     entrypoint: /usr/src/app/beat-entrypoint.sh
     command: celery -A reNgine beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
     environment:
@@ -81,8 +80,7 @@ services:
       - rengine_network
 
   web:
-    build:
-      context: ./web
+    build: ./web
     entrypoint: /usr/src/app/entrypoint.sh
     restart: always
     image: yogeshojha/rengine:master
@@ -107,14 +105,10 @@ services:
       - nuclei_templates:/root/nuclei-templates
       - tool_config:/root/.config
       - static_volume:/usr/src/app/staticfiles/
-    ports:
-      - "8000:8000"
     depends_on:
       - db
       - celery
       - celery-beat
-    networks:
-      - rengine_network
     networks:
       rengine_network:
         aliases: