From 56ae2e566efc76b50ce80a2a86e10e2a4f931b0b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 31 Jan 2022 14:52:44 +0100
Subject: [PATCH] adding proxy to build process

---
 hosting/docker-compose.yaml                    | 4 +---
 hosting/scripts/linux/release-to-docker-hub.sh | 2 ++
 package.json                                   | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index c8d003474..57fd809df 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -80,9 +80,7 @@ services:
 
   proxy-service:
     restart: always
-    image: nginx:latest
-    volumes:
-      - ./proxy/nginx.conf:/etc/nginx/nginx.conf
+    image: budibase/proxy
     ports:
       - "${MAIN_PORT}:10000"
     depends_on:
diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index 642a8682f..599a10f91 100755
--- a/hosting/scripts/linux/release-to-docker-hub.sh
+++ b/hosting/scripts/linux/release-to-docker-hub.sh
@@ -9,8 +9,10 @@ fi
 
 echo "Tagging images with tag: $tag"
 
+docker tag proxy-service budibase/proxy:$tag
 docker tag app-service budibase/apps:$tag
 docker tag worker-service budibase/worker:$tag
 
 docker push --all-tags budibase/apps 
 docker push --all-tags budibase/worker
+docker push --all-tags budibase/proxy
diff --git a/package.json b/package.json
index 929576a69..f942eb94f 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,10 @@
     "lint:fix": "yarn run lint:fix:ts && yarn run lint:fix:prettier && yarn run lint:fix:eslint",
     "test:e2e": "lerna run cy:test",
     "test:e2e:ci": "lerna run cy:ci",
-    "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker:proxy": "docker build hosting/proxy -t proxy-service",
     "build:docker:selfhost": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -",
-    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
+    "build:docker:develop": "node scripts/pinVersions && lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -",
     "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
     "build:docs": "lerna run build:docs",