From 89842fafdeb97ac9d3f3f3ad9ae1869b3f098ffe Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 6 Feb 2020 16:17:44 +0100
Subject: [PATCH 1/4] backend/proxy: fix envoy version

---
 backend/proxy/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/proxy/Dockerfile b/backend/proxy/Dockerfile
index 9a38a06255..cb7522cad2 100644
--- a/backend/proxy/Dockerfile
+++ b/backend/proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM envoyproxy/envoy:latest
+FROM envoyproxy/envoy:v1.13.0
 
 COPY ./envoy.yaml /etc/envoy/envoy.yaml
 

From bee14ad29bc81ffc78405f228f2c1fee49448bce Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 6 Feb 2020 16:18:00 +0100
Subject: [PATCH 2/4] backend/Dockerfile: install ca-certificates

---
 backend/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index a5aae4c2a8..f335af2324 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -16,6 +16,8 @@ RUN go build .
 FROM debian:buster
 ARG service
 
+RUN apt-get update && apt-get install -y ca-certificates
+
 WORKDIR /app/
 
 COPY --from=build /build/$service/$service /app/service

From 8fdd8e54b361b345a11f48be580c5ed63ea1637b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 6 Feb 2020 16:18:17 +0100
Subject: [PATCH 3/4] backend/proxy: added builds service route

---
 backend/proxy/envoy.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/backend/proxy/envoy.yaml b/backend/proxy/envoy.yaml
index f0a5568331..eca02ae0c8 100644
--- a/backend/proxy/envoy.yaml
+++ b/backend/proxy/envoy.yaml
@@ -28,6 +28,10 @@ static_resources:
                           route:
                             cluster: identity_service
                             max_grpc_timeout: 0s
+                        - match: { prefix: '/spotify.backstage.builds.v1.Builds/' }
+                          route:
+                            cluster: builds_service
+                            max_grpc_timeout: 0s
                         - match: { prefix: '/inventory' }
                           route:
                             cluster: inventory_service
@@ -58,6 +62,15 @@ static_resources:
         - socket_address:
             address: identity
             port_value: 50051
+    - name: builds_service
+      connect_timeout: 0.25s
+      type: logical_dns
+      http2_protocol_options: {}
+      lb_policy: round_robin
+      hosts:
+        - socket_address:
+            address: builds
+            port_value: 50051
     - name: inventory_service
       connect_timeout: 0.25s
       type: logical_dns

From 88a56ac68f4a4862f1a9eaabad170c220072ffdf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 6 Feb 2020 16:19:07 +0100
Subject: [PATCH 4/4] docker-compose: include secrets in scaffolder

---
 docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d9d5f2490b..76f8f4f1c7 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -37,3 +37,4 @@ services:
       args:
         service: scaffolder
     restart: unless-stopped
+    env_file: secrets.env