From 82b56e1b6f5be8fba5144e3f113c3e32b537fa3c Mon Sep 17 00:00:00 2001
From: Shiny Nematoda <snematoda@noreply.codeberg.org>
Date: Tue, 13 Dec 2022 11:08:30 +0000
Subject: [PATCH] [BREAKING] Pre-built images and Auto Updates

---
 README.md                   | 20 ++++----------------
 docker-compose.template.yml | 29 +++++++++++++++++------------
 gen.sh                      | 13 +++++--------
 update.sh                   | 20 --------------------
 4 files changed, 26 insertions(+), 56 deletions(-)
 delete mode 100644 update.sh

diff --git a/README.md b/README.md
index 59c4227..83a0255 100644
--- a/README.md
+++ b/README.md
@@ -13,39 +13,27 @@ Make sure the following dependencies are met:
 
 Clone the repo
 ```sh
-$ git clone https://codeberg.org/Hyperpipe/Docker
+git clone https://codeberg.org/Hyperpipe/Docker
 cd Docker
 ```
 
 Make the setup script executable
 ```sh
-$ chmod u+x gen.sh
+chmod u+x gen.sh
 ```
 
 Run the setup script
 ```sh
-$ ./gen.sh
+./gen.sh
 ```
 
 ### Step 3 - Docker
 
 *Run the following commands as root*
 
-Build
-```sh
-$ docker-compose build
-```
-
 Start the container
 ```sh
-$ docker-compose up
-```
-
-## Updating
-
-Run the update script
-```sh
-$ ./update.sh
+docker-compose up
 ```
 
 ## Cleaning
diff --git a/docker-compose.template.yml b/docker-compose.template.yml
index 25e0e51..b2082c5 100644
--- a/docker-compose.template.yml
+++ b/docker-compose.template.yml
@@ -2,23 +2,28 @@ version: '3'
 
 services:
   hyperpipe-frontend:
-    image: hyperpipe-frontend
+    image: codeberg.org/hyperpipe/hyperpipe:latest
     container_name: hyperpipe-frontend
-    build: 
-      context: ./Hyperpipe
-      args:
-        api: hyperpipeapi.onrender.com
-        pipedapi: pipedapi.kavin.rocks 
     restart: unless-stopped
+    entrypoint: sh -c 'find /usr/share/nginx/html -type f -exec sed -i s/pipedapi.kavin.rocks/PIPED/g {} \; -exec sed -i s/hyperpipeapi.onrender.org/BACKEND/g {} \; && /docker-entrypoint.sh && nginx -g "daemon off;"'
     ports:
       - '8080:80'
   hyperpipe-backend:
-    image: hyperpipe-backend
+    image: codeberg.org/hyperpipe/hyperpipe-backend:latest
     container_name: hyperpipe-backend
-    build:
-      context: ./hyperpipe-backend
-      args:
-        proxy: hyperpipe-proxy.onrender.com
+    environment:
+      - HYP_PROXY='hyperpipe-proxy.onrender.com'
     restart: unless-stopped
     ports:
-      - '3000:3000'
\ No newline at end of file
+      - '3000:3000'
+  watchtower:
+    image: containrrr/watchtower
+    container_name: watchtower
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /etc/timezone:/etc/timezone:ro
+    environment:
+      - WATCHTOWER_CLEANUP=true
+      - WATCHTOWER_INCLUDE_RESTARTING=true
+    command: hyperpipe-frontend hyperpipe-backend watchtower
\ No newline at end of file
diff --git a/gen.sh b/gen.sh
index 05ef0a4..09bfa26 100644
--- a/gen.sh
+++ b/gen.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -e
+
 printf "\nEnter hostname for Proxy (Same as the one used for Piped): " && read -r proxy
 
 printf '\nFetching List of Hostnames for Backends (Hyperpipe) \n\n'
@@ -11,20 +14,14 @@ curl -s "https://piped-instances.kavin.rocks" | jq '.[].api_url|ltrimstr("https:
 
 printf "\nEnter hostname for the default piped backend to be used: " && read -r piped
 
-rm -rf ./Hyperpipe ./hyperpipe-backend
-
-git clone --depth 1 https://codeberg.org/Hyperpipe/Hyperpipe.git
-
-git clone --depth 1 https://codeberg.org/Hyperpipe/hyperpipe-backend
-
 rm -f "*/docker-compose.yml"
 
 cp docker-compose.template.yml docker-compose.yml
 
 sed -i "s/hyperpipe-proxy.onrender.com/$proxy/g" docker-compose.yml
 
-sed -i "s/pipedapi.kavin.rocks/$piped/g" docker-compose.yml
+sed -i "s/PIPED/$piped/g" docker-compose.yml
 
-sed -i "s/hyperpipeapi.onrender.com/$backend/g" docker-compose.yml
+sed -i "s/BACKEND/$backend/g" docker-compose.yml
 
 printf '\nDone!\n'
\ No newline at end of file
diff --git a/update.sh b/update.sh
deleted file mode 100644
index 2ee5908..0000000
--- a/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -x
-sudo docker-compose down
-
-cd Hyperpipe
-rm -rf docker-compose.yml
-
-git pull
-cd ..
-
-cd hyperpipe-backend
-rm -rf docker-compose.yml
-
-git pull
-cd ..
-
-sudo docker-compose build
-sudo docker-compose up -d
-echo "Do not forget to clear old docker data!"
\ No newline at end of file