feat: remove unnecessary Nginx proxy

Author: PascalinDe

Dockerfiles/Dockerfile.backend

@@ -1,12 +1,8 @@
 FROM node:20-bookworm
 
-# install Nginx
-RUN apt-get update && apt-get install nginx -y
-COPY ../Dockerfiles/nginx/default /etc/nginx/sites-available/default
-
 # install backend
 WORKDIR /web/backend
 COPY ../web/backend .
 RUN npm install
-ENTRYPOINT ["/bin/bash", "-c", "/usr/sbin/nginx && npm start"]
+ENTRYPOINT ["/bin/bash", "-c", "npm start"]
 

Dockerfiles/nginx/default

@@ -17,6 +17,9 @@ services:
       - apparmor:unconfined
     cap_add:
       - SYS_PTRACE
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.255
   dela-worker-1:             # DELA worker node
     image: dela
     build:
@@ -34,6 +37,9 @@ services:
       - apparmor:unconfined
     cap_add:
       - SYS_PTRACE
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.254
   dela-worker-2:             # DELA worker node
     image: dela
     build:
@@ -51,6 +57,9 @@ services:
       - apparmor:unconfined
     cap_add:
       - SYS_PTRACE
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.253
 
   frontend:         # web service frontend
     image: frontend
@@ -63,6 +72,9 @@ services:
     environment:
       BACKEND_HOST: ${BACKEND_HOST}
       BACKEND_PORT: ${BACKEND_PORT}
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.2
 
   backend:          # web service backend
     image: backend
@@ -88,6 +100,9 @@ services:
     volumes:
       - backend-data:/data
       - ./web/backend/src:/web/backend/src
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.3
 
   db:               # PostgreSQL database
     image: postgres:15
@@ -97,10 +112,20 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
       - ./web/backend/src/migration.sql:/docker-entrypoint-initdb.d/init.sql
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.4
 
 volumes:
   postgres-data:    # PostgreSQL database
   dela-worker-0-data:
   dela-worker-1-data:
   dela-worker-2-data:
   backend-data:
+
+networks:
+  d-voting:
+    ipam:
+      config:
+        - subnet: 172.19.0.0/16
+          gateway: 172.19.0.1

docker-compose.debug.yml

@@ -11,6 +11,9 @@ services:
     volumes:
       - dela-worker-0-data:/data
     hostname: dela-worker-0
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.255
   dela-worker-1:             # DELA worker node
     image: dela
     build:
@@ -22,6 +25,9 @@ services:
     volumes:
       - dela-worker-1-data:/data
     hostname: dela-worker-1
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.254
   dela-worker-2:             # DELA worker node
     image: dela
     build:
@@ -33,6 +39,9 @@ services:
     volumes:
       - dela-worker-2-data:/data
     hostname: dela-worker-2
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.253
 
   frontend:         # web service frontend
     image: frontend
@@ -43,6 +52,9 @@ services:
     environment:
       BACKEND_HOST: ${BACKEND_HOST}
       BACKEND_PORT: ${BACKEND_PORT}
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.2
 
   backend:          # web service backend
     image: backend
@@ -61,12 +73,14 @@ services:
       PRIVATE_KEY: ${PRIVATE_KEY}
     ports:
       - 127.0.0.1:5000:5000
-      - 127.0.0.1:80:80
     depends_on:
       db:
         condition: service_started
     volumes:
       - backend-data:/data
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.3
 
   db:               # PostgreSQL database
     image: postgres:15
@@ -76,10 +90,20 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
       - ./web/backend/src/migration.sql:/docker-entrypoint-initdb.d/init.sql
+    networks:
+      d-voting:
+        ipv4_address: 172.19.0.4
 
 volumes:
   postgres-data:    # PostgreSQL database
   dela-worker-0-data:
   dela-worker-1-data:
   dela-worker-2-data:
   backend-data:
+
+networks:
+  d-voting:
+    ipam:
+      config:
+        - subnet: 172.19.0.0/16
+          gateway: 172.19.0.1