docker kompostownik is working 🎉

docker-compose.yml

@@ -3,10 +3,6 @@ services:
     build:
       context: ./server
       dockerfile: Dockerfile
-    ports:
-      - "${SERVER_PORT}:${SERVER_PORT}"
-#    env_file:
-#      - .server/.env
     environment:
       SERVER_PORT: ${SERVER_PORT}
       JWT_SECRET: ${JWT_SECRET}
@@ -14,10 +10,15 @@ services:
       PG_USER: ${PG_USER}
       PG_PASSWORD: ${PG_PASSWORD}
       PG_DATABASE: ${PG_DATABASE}
-      PG_HOST: ${PG_HOST}
+      PG_HOST: db
       PG_PORT: ${PG_PORT}
+    ports:
+      - "${SERVER_PORT}:${SERVER_PORT}"
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+    networks:
+      - relay-network
 
   relay-client:
     build:
@@ -25,24 +26,34 @@ services:
       dockerfile: Dockerfile
     ports:
       - "80:80"
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - relay-network
 
   db:
     image: postgres:latest
     restart: always
     user: postgres
     volumes:
-      - db-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: ${PG_USER}
       POSTGRES_DB: ${PG_DATABASE}
       POSTGRES_PASSWORD: ${PG_PASSWORD}
     expose:
-      - ${PG_PORT}
+      - "${PG_PORT}"
     healthcheck:
       test: [ "CMD", "pg_isready", "-U", "${PG_USER}" ]
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - relay-network
+
+networks:
+  relay-network:
+    driver: bridge
 
 volumes:
   postgres-data: