From 2918e164132b0879358b9e4280fbb3d98e3b2c43 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 4 Feb 2020 15:37:39 +0100
Subject: [PATCH] backend: added generic dockerfile

---
 backend/Dockerfile            | 23 +++++++++++++++++++++++
 backend/proxy/envoy.yaml      | 10 +++++-----
 backend/scaffolder/Dockerfile |  0
 docker-compose.yaml           | 26 ++++++++++++--------------
 4 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 backend/Dockerfile
 delete mode 100644 backend/scaffolder/Dockerfile

diff --git a/backend/Dockerfile b/backend/Dockerfile
new file mode 100644
index 0000000000..a5aae4c2a8
--- /dev/null
+++ b/backend/Dockerfile
@@ -0,0 +1,23 @@
+FROM golang:1.13 AS build
+ARG service
+
+WORKDIR /build/$service/
+
+COPY proto/go.mod proto/go.sum /build/proto/
+COPY $service/go.mod $service/go.sum /build/$service/
+
+RUN go mod download
+
+COPY proto/ /build/proto/
+COPY $service/ /build/$service/
+
+RUN go build .
+
+FROM debian:buster
+ARG service
+
+WORKDIR /app/
+
+COPY --from=build /build/$service/$service /app/service
+
+CMD ["./service"]
diff --git a/backend/proxy/envoy.yaml b/backend/proxy/envoy.yaml
index 121f658d88..f0a5568331 100644
--- a/backend/proxy/envoy.yaml
+++ b/backend/proxy/envoy.yaml
@@ -24,7 +24,7 @@ static_resources:
                     - name: local_service
                       domains: ['*']
                       routes:
-                        - match: { prefix: '/identity' }
+                        - match: { prefix: '/spotify.backstage.identity.v1.Identity/' }
                           route:
                             cluster: identity_service
                             max_grpc_timeout: 0s
@@ -57,7 +57,7 @@ static_resources:
       hosts:
         - socket_address:
             address: identity
-            port_value: 80
+            port_value: 50051
     - name: inventory_service
       connect_timeout: 0.25s
       type: logical_dns
@@ -66,7 +66,7 @@ static_resources:
       hosts:
         - socket_address:
             address: inventory
-            port_value: 80
+            port_value: 50051
     - name: scaffolder_service
       connect_timeout: 0.25s
       type: logical_dns
@@ -74,5 +74,5 @@ static_resources:
       lb_policy: round_robin
       hosts:
         - socket_address:
-            address: scaffolder
-            port_value: 80
+            address: identity
+            port_value: 50051
diff --git a/backend/scaffolder/Dockerfile b/backend/scaffolder/Dockerfile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6537ced208..ece7545eb6 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,22 +11,20 @@ services:
     ports:
       - "8080:80"
 
-  # identity:
-  #   container_name: boss-identity
-  #   build:
-  #     context: backend/identity
-  #   restart: unless-stopped
-
-  # inventory:
-  #   container_name: boss-inventory
-  #   build:
-  #     context: backend/inventory
-  #   restart: unless-stopped
+  identity:
+    container_name: boss-identity
+    build:
+      context: backend
+      args:
+        service: identity
+    restart: unless-stopped
+    volumes:
+       - ./backend/identity/identity-data.json:/app/identity-data.json
 
   scaffolder:
     container_name: boss-scaffolder
     build:
-      context: backend/scaffolder
+      context: backend
+      args:
+        service: scaffolder
     restart: unless-stopped
-
-