Добавлен revers proxy (nginx). Теперь ChartService не запустится, пока postgres не будет готов принимать запросы

docker-compose.yaml

@@ -1,13 +1,23 @@
-version: '3.8'
-
 services:
+  nginx:
+    image: nginx:latest
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+      - ./CertSSL:/etc/nginx/ssl
+    depends_on:
+      - server
+      - chart
+
   server:
     build:
       context: ./
       dockerfile: Dockerfile-server
     restart: unless-stopped
     ports:
-      - '0.0.0.0:3000:3000'
+      - '3000:3000'
     volumes:
       - './CertSSL:/CertSSL'
       - './config.yaml:/config.yaml'
@@ -19,12 +29,13 @@ services:
       context: ./chart
     restart: unless-stopped
     ports:
-      - '0.0.0.0:3030:3030'
+      - '3030:3030'
     volumes:
       - './CertSSL:/CertSSL'
       - './config.yaml:/config.yaml'
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
 
   collect-currency:
     build:
@@ -40,8 +51,15 @@ services:
     image: postgres:latest
     restart: unless-stopped
     env_file: .env
+    ports:
+      - '5432:5432'
     volumes:
       - ./postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $POSTGRES_USER"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   server:

nginx.conf

@@ -0,0 +1,57 @@
+events { }
+
+http {
+    upstream server_backend {
+        server server:3000;
+    }
+
+    upstream chart_backend {
+        server chart:3030;
+    }
+
+    server {
+        listen 80;
+        server_name localhost; # Your domain
+
+
+        location / {
+            proxy_pass http://server_backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        location /api/getChart {
+            proxy_pass http://chart_backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+
+    server {
+        listen 443 ssl;
+        server_name localhost;
+
+        ssl_certificate /etc/nginx/ssl/fullchain.pem;
+        ssl_certificate_key /etc/nginx/ssl/privkey.pem;
+
+        location / {
+            proxy_pass http://server_backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        location /api/getChart {
+            proxy_pass http://chart_backend;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+}