diff --git a/balakhonov_danila_lab_3/docker-compose.yaml b/balakhonov_danila_lab_3/docker-compose.yaml index fd9a5dc..8a1d306 100644 --- a/balakhonov_danila_lab_3/docker-compose.yaml +++ b/balakhonov_danila_lab_3/docker-compose.yaml @@ -1,17 +1,15 @@ services: - restaurant-service: + restaurant_service: build: ./ApiRestaurant/ - container_name: restaurant environment: - WAITER_API_URL: http://waiter-service:4000 + WAITER_API_URL: http://localhost:80/waiters/ expose: - 8080 depends_on: - - waiter-service + - waiter_service - waiter-service: + waiter_service: build: ./ApiWaiter/ - container_name: waiter environment: PORT: 4000 expose: @@ -20,8 +18,8 @@ services: nginx: image: nginx depends_on: - - restaurant-service - - waiter-service + - restaurant_service + - waiter_service ports: - "80:80" volumes: diff --git a/balakhonov_danila_lab_3/nginx.conf b/balakhonov_danila_lab_3/nginx.conf index 742d868..3595927 100644 --- a/balakhonov_danila_lab_3/nginx.conf +++ b/balakhonov_danila_lab_3/nginx.conf @@ -9,7 +9,7 @@ http { server_name localhost; location /waiters/ { - proxy_pass http://waiter:4000/; + proxy_pass http://waiter_service:4000/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; @@ -17,7 +17,7 @@ http { } location /restaurants/ { - proxy_pass http://restaurant:8080/; + proxy_pass http://restaurant_service:8080/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme;