From 9b755d5775710e717e81d69c2ba665cbcc83c1b3 Mon Sep 17 00:00:00 2001
From: Eden Kirin <eden@ekirin.com>
Date: Sun, 14 Jan 2024 23:40:03 +0100
Subject: [PATCH] Rename containers

---
 docker-compose.yml | 10 +++++-----
 proxy/envoy.yaml   | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fc7f569..b2d94c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
             interval: 1s
             timeout: 5s
             retries: 10
-    machines-service:
+    machines-app:
         build:
             context: ./machines
             dockerfile: Dockerfile
@@ -24,13 +24,13 @@ services:
             - DBNAME=komponiranje
             - DBUSER=pero
             - DBPASSWORD=pero.000
-            - PRODUCTSAPPURL=http://products-service:3000
+            - PRODUCTSAPPURL=http://products-app:3000
         # ports:
         #     - 3000:3000
         depends_on:
             db:
                 condition: service_healthy
-    products-service:
+    products-app:
         build:
             context: ./products
             dockerfile: Dockerfile
@@ -53,5 +53,5 @@ services:
         volumes:
             - ./proxy/envoy.yaml:/etc/envoy/envoy.yaml
         depends_on:
-            - machines-service
-            - products-service
+            - machines-app
+            - products-app
diff --git a/proxy/envoy.yaml b/proxy/envoy.yaml
index 2064f9b..8747de1 100644
--- a/proxy/envoy.yaml
+++ b/proxy/envoy.yaml
@@ -21,41 +21,41 @@ static_resources:
                         - match:
                             prefix: "/machines"
                           route:
-                            cluster: machines-app-service
+                            cluster: machines-app
                         - match:
                             prefix: "/products"
                           route:
-                            cluster: products-app-service
+                            cluster: products-app
                 http_filters:
                   - name: envoy.filters.http.router
                     typed_config:
                       "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
   clusters:
-    - name: machines-app-service
+    - name: machines-app
       connect_timeout: 0.25s
       type: strict_dns
       lb_policy: round_robin
       load_assignment:
-        cluster_name: machines-app-service
+        cluster_name: machines-app
         endpoints:
           - lb_endpoints:
               - endpoint:
                   address:
                     socket_address:
-                      address: machines-service
+                      address: machines-app
                       port_value: 3000
-    - name: products-app-service
+    - name: products-app
       connect_timeout: 0.25s
       type: strict_dns
       lb_policy: round_robin
       load_assignment:
-        cluster_name: products-app-service
+        cluster_name: products-app
         endpoints:
           - lb_endpoints:
               - endpoint:
                   address:
                     socket_address:
-                      address: products-service
+                      address: products-app
                       port_value: 3000
 admin:
   access_log_path: "/dev/null"