From aae6ed7157ba0a6ea694d5412b1b330d6a0895f2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 8 Jan 2021 11:59:42 +0000
Subject: [PATCH] Updating envoy to handle API request, proxy to app-service,
 doesn't have to come from /app/api.

---
 hosting/envoy.yaml                      |  4 ++++
 hosting/scripts/linux/install-docker.sh | 18 +++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/hosting/envoy.yaml b/hosting/envoy.yaml
index b355dd804b..3fe8454305 100644
--- a/hosting/envoy.yaml
+++ b/hosting/envoy.yaml
@@ -20,6 +20,10 @@ static_resources:
                 route:
                   cluster: app-service
                   prefix_rewrite: "/"
+              
+              # special case for when API requests are made, can just forward, not to minio    
+              - match: { prefix: "/api/" }
+                  cluster: app-service
 
               - match: { prefix: "/worker/" }
                 route: 
diff --git a/hosting/scripts/linux/install-docker.sh b/hosting/scripts/linux/install-docker.sh
index dccf688de1..a71809c31f 100755
--- a/hosting/scripts/linux/install-docker.sh
+++ b/hosting/scripts/linux/install-docker.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
-sudo apt-get install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-sudo apt-get update
-sudo apt-get install docker-ce docker-ce-cli containerd.io
+echo "**** WARNING - not for production environments ****"
+# warning this is a convience script, for production installations install docker 
+# properly for your environment!
+curl -fsSL https://get.docker.com -o get-docker.sh
+sudo sh get-docker.sh