review feedback, removed node app

linkerd · Apr 18, 2017 · 2967d22 · 2967d22
1 parent 917ff85
commit 2967d22
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 49 deletions.
diff --git a/consul/README.md b/consul/README.md
@@ -9,16 +9,16 @@ configuration
 The following components make up the system:
 * `curl` which acts as our client application
 * `linkerd` for proxying requests to our service
-* `audit` example service which has a `/health` endpoint
+* `helloworld` example service
 * `consul` as our service discovery back-end
 * [`consul-registrator`](https://github.com/gliderlabs/registrator)
 to automatically registers services with consul
 
 **System overview**
 ```
-+--------+      +---------+    +-----------------+
-| client +----> | linkerd +--> | service (audit) |
-+--------+      +----^----+    +-------+---------+
++--------+      +---------+    +----------------------+
+| client +----> | linkerd +--> | service (helloworld) |
++--------+      +----^----+    +-------+--------------+
                      |                 |
                 +----+---+     +-------v------------+
                 | consul <-----+ consul registrator |
@@ -38,10 +38,10 @@ $ docker-compose build && docker-compose up -d
 ## Testing the system
 To make sure everything is working properly run the following command:
 ```bash
-$ curl localhost:4140/audit/health
+$ curl localhost:4140/helloworld
 ```
 
 You will get the following response:
 ```bash
-I am healthy!
-```
+Hello!
+```
diff --git a/consul/audit/Dockerfile b/consul/audit/Dockerfile
diff --git a/consul/audit/index.js b/consul/audit/index.js
diff --git a/consul/audit/package.json b/consul/audit/package.json
diff --git a/consul/docker-compose.yaml b/consul/docker-compose.yaml
@@ -4,22 +4,19 @@ services:
     image: "consul:0.8.0"
     ports:
       - "8500:8500"
-  audit:
-    build: ./audit/
-    command: ["node", "/usr/src/app/index.js"]
+  service:
+    image: buoyantio/helloworld
+    command: ["-addr=:7777", "-text=Hello"]
     ports:
-      - "8100:8100"
-    volumes:
-      - ./audit/:/usr/src/app/
-    environment:
-      - SERVICE_NAME=audit
+      - "7777:7777"
+
   linkerd:
       image: buoyantio/linkerd:0.9.1
       command: ['/config.yaml']
       links:
         - consul
       volumes:
-        - ./linkerd/linkerd.conf.yaml:/config.yaml
+        - ./linkerd.yml:/config.yaml
       ports:
         - 9990:9990
         - 4140:4140
@@ -33,4 +30,4 @@ services:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock
     depends_on:
-      - consul
+      - consul
diff --git a/consul/linkerd/linkerd.conf.yaml → consul/linkerd.yml b/consul/linkerd/linkerd.conf.yaml → consul/linkerd.yml
@@ -20,4 +20,4 @@ routers:
   client:
    retries:
     budget:
-     percentCanRetry: 5.0
+     percentCanRetry: 5.0