From 18d81afee4de8c848c6623e226eef13d27ad93d4 Mon Sep 17 00:00:00 2001
From: FireMaskterK <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 1 Dec 2021 03:31:03 +0000
Subject: [PATCH 1/4] Automatically use the hotspot image when on aarch64.

---
 configure-instance.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure-instance.sh b/configure-instance.sh
index 68ddbf5..4fb71b6 100755
--- a/configure-instance.sh
+++ b/configure-instance.sh
@@ -19,4 +19,8 @@ sed -i "s/FRONTEND_HOSTNAME/$frontend/g" config/*
 sed -i "s/BACKEND_HOSTNAME/$backend/g" config/*
 sed -i "s/PROXY_HOSTNAME/$proxy/g" config/*
 
+if [[ "$(uname -m)" == "aarch64" ]]; then
+    sed -i "s/piped:latest/piped:hotspot/g" config/*
+fi
+
 mv config/docker-compose.$reverseproxy.yml docker-compose.yml

From 127f4b3625af22eaf37fe2c6b4b9c052f3ec5aa7 Mon Sep 17 00:00:00 2001
From: FireMaskterK <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 1 Dec 2021 04:27:34 +0000
Subject: [PATCH 2/4] Add docker-compose version check.

---
 configure-instance.sh | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/configure-instance.sh b/configure-instance.sh
index 4fb71b6..04b4adc 100755
--- a/configure-instance.sh
+++ b/configure-instance.sh
@@ -1,14 +1,22 @@
-echo "Enter a hostname for the Frontend (eg: piped.kavin.rocks):"
-read frontend
+# Check if Docker-Compose is not installed
+if [ -z "$(which docker-compose)" ]; then
+    echo "Docker-Compose is not installed. Please install it first from https://docs.docker.com/compose/install/#install-compose."
+    exit 1
+fi
 
-echo "Enter a hostname for the Backend (eg: pipedapi.kavin.rocks):"
-read backend
+# Docker-Compose version check, to prevent "Unsupported configuration option"
+COMPOSE_VERSION=$(docker-compose version --short)
+REQUIRED_COMPOSE_VERSION="1.28.0"
+if [[ $(printf '%s\n' "$REQUIRED_COMPOSE_VERSION" "$COMPOSE_VERSION" | sort -V | head -n1) != $REQUIRED_COMPOSE_VERSION ]]; then
+    echo "Your docker-compose version of $COMPOSE_VERSION is too old. Please upgrade to $REQUIRED_COMPOSE_VERSION or higher."
+    echo "See https://docs.docker.com/compose/install/#install-compose for installation instructions."
+    exit 1
+fi
 
-echo "Enter a hostname for the Proxy (eg: pipedproxy.kavin.rocks):"
-read proxy
-
-echo "Enter the reverse proxy you would like to use (either caddy or nginx):"
-read reverseproxy
+echo "Enter a hostname for the Frontend (eg: piped.kavin.rocks):" && read -r frontend
+echo "Enter a hostname for the Backend (eg: pipedapi.kavin.rocks):" && read -r backend
+echo "Enter a hostname for the Proxy (eg: pipedproxy.kavin.rocks):" && read -r proxy
+echo "Enter the reverse proxy you would like to use (either caddy or nginx):" && read -r reverseproxy
 
 rm -rf config/
 rm -f docker-compose.yml
@@ -19,6 +27,7 @@ sed -i "s/FRONTEND_HOSTNAME/$frontend/g" config/*
 sed -i "s/BACKEND_HOSTNAME/$backend/g" config/*
 sed -i "s/PROXY_HOSTNAME/$proxy/g" config/*
 
+# The openj9 image does not support aarch64
 if [[ "$(uname -m)" == "aarch64" ]]; then
     sed -i "s/piped:latest/piped:hotspot/g" config/*
 fi

From bbd06a4124409aaf94673268d6391838d8d258e7 Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 12 Jan 2022 22:52:03 +0000
Subject: [PATCH 3/4] Fix for frontend startup issues.

---
 template/docker-compose.caddy.yml | 11 +++++++----
 template/docker-compose.nginx.yml |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml
index df64ec5..5da0875 100644
--- a/template/docker-compose.caddy.yml
+++ b/template/docker-compose.caddy.yml
@@ -5,7 +5,9 @@ services:
         depends_on:
             - piped
         container_name: piped-frontend
-        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g /usr/share/nginx/html/js/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
+        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g
+            /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g
+            "daemon off;"'
     ytproxy:
         image: 1337kavin/ytproxy:latest
         restart: unless-stopped
@@ -29,7 +31,8 @@ services:
         depends_on:
             - piped
         healthcheck:
-            test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
+            test: ash -c "wget --no-verbose --tries=1 --spider
+                127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
             interval: 10s
             timeout: 10s
             retries: 1
@@ -67,5 +70,5 @@ services:
         container_name: watchtower
         command: piped-frontend piped-backend ytproxy varnish caddy postgres watchtower
 volumes:
-    caddy_data:
-    ytproxy:
+    caddy_data: null
+    ytproxy: null
diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml
index c3234e7..6540935 100644
--- a/template/docker-compose.nginx.yml
+++ b/template/docker-compose.nginx.yml
@@ -5,7 +5,9 @@ services:
         depends_on:
             - piped
         container_name: piped-frontend
-        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g /usr/share/nginx/html/js/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
+        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/BACKEND_HOSTNAME/g
+            /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g
+            "daemon off;"'
     ytproxy:
         image: 1337kavin/ytproxy:latest
         restart: unless-stopped
@@ -29,7 +31,8 @@ services:
         depends_on:
             - piped
         healthcheck:
-            test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
+            test: ash -c "wget --no-verbose --tries=1 --spider
+                127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
             interval: 10s
             timeout: 10s
             retries: 1
@@ -73,4 +76,4 @@ services:
         container_name: watchtower
         command: piped-frontend piped-backend ytproxy varnish nginx postgres watchtower
 volumes:
-    ytproxy:
+    ytproxy: null

From 597bdfb23d707efe0aa3e597794508578bd97215 Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 13 Jan 2022 11:55:50 +0000
Subject: [PATCH 4/4] Make healthcheck test bypass cache.

---
 template/docker-compose.caddy.yml | 4 ++--
 template/docker-compose.nginx.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/docker-compose.caddy.yml b/template/docker-compose.caddy.yml
index 5da0875..761eb49 100644
--- a/template/docker-compose.caddy.yml
+++ b/template/docker-compose.caddy.yml
@@ -31,8 +31,8 @@ services:
         depends_on:
             - piped
         healthcheck:
-            test: ash -c "wget --no-verbose --tries=1 --spider
-                127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
+            test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed ||
+                (varnishreload && exit 1)"
             interval: 10s
             timeout: 10s
             retries: 1
diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml
index 6540935..1de3039 100644
--- a/template/docker-compose.nginx.yml
+++ b/template/docker-compose.nginx.yml
@@ -31,8 +31,8 @@ services:
         depends_on:
             - piped
         healthcheck:
-            test: ash -c "wget --no-verbose --tries=1 --spider
-                127.0.0.1:80/trending?region=US || (varnishreload && exit 1)"
+            test: ash -c "wget --no-verbose --tries=1 --spider 127.0.0.1:80/feed ||
+                (varnishreload && exit 1)"
             interval: 10s
             timeout: 10s
             retries: 1