From 413b4f9181320971e1678af4ef5cb2be3f3698ac Mon Sep 17 00:00:00 2001
From: KemoNine <kemonine@lollipopcloud.solutions>
Date: Tue, 15 Jan 2019 12:04:03 -0500
Subject: [PATCH] Update service documentation to use the main registry
 builds/mirrors instead of building the docker images by hand

---
 services/nextcloud.md | 39 ++++++++++++++-------------------------
 services/pi_hole.md   | 26 +++++++++-----------------
 services/searx.md     | 18 +++++-------------
 3 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/services/nextcloud.md b/services/nextcloud.md
index d780928..a5b6b32 100644
--- a/services/nextcloud.md
+++ b/services/nextcloud.md
@@ -25,29 +25,6 @@ chown -R www-data: /var/nextcloud
 cat > /scratch/docker/nextcloud.sh <<EOF
 #!/bin/bash
 
-ARCH=\`arch\`
-UPSTREAM="arm32v7/nextcloud:stable"
-
-# Cleanup arch/container image here
-if [ \$ARCH == "aarch64" ]
-then
-    echo "64bit arm"
-    UPSTREAM="arm64v8/nextcloud:stable"
-else
-    echo "32bit arm"
-    UPSTREAM="arm32v7/nextcloud:stable"
-fi
-
-echo "Updating"
-
-docker pull \$UPSTREAM
-
-echo "Running with latest release"
-
-# Cleanup existing container
-docker stop nextcloud
-docker rm nextcloud
-
 ##########
 # For postgresql instead of sqlite run the following commands
 #docker exec -it postgres psql -U postgres
@@ -57,7 +34,19 @@ docker rm nextcloud
 # Setup using the above database/username/role and ip of 172.30.12.12
 ##########
 
-# Re-run/create container with latest image
+ARCH=\`arch\`
+if [ \$ARCH == "aarch64" ]
+then
+    ARCH="arm64v8"
+else
+    ARCH="arm32v7"
+fi
+
+docker pull registry.lollipopcloud.solutions/\$ARCH/nextcloud
+
+docker container stop nextcloud
+docker container rm nextcloud
+
 docker run \\
     --name nextcloud \\
     --restart unless-stopped \\
@@ -66,7 +55,7 @@ docker run \\
     -e TZ=UTC \\
     -e DEBUG=1 \\
     -v /var/nextcloud:/var/www/html \\
-    \$UPSTREAM
+    registry.lollipopcloud.solutions/\$ARCH/nextcloud
 
 EOF
 
diff --git a/services/pi_hole.md b/services/pi_hole.md
index f8977e1..7287d08 100644
--- a/services/pi_hole.md
+++ b/services/pi_hole.md
@@ -36,40 +36,32 @@ cat > /scratch/docker/pi-hole.sh <<EOF
 #!/bin/bash
 
 ARCH=\`arch\`
-UPSTREAM=""
-
-# Cleanup arch/container image here
 if [ \$ARCH == "aarch64" ]
 then
-    echo "64bit arm"
-    UPSTREAM="registry.lollipopcloud.solutions/arm64v8/pi-hole:v3.3"
+    ARCH="arm64v8"
 else
-    echo "32bit arm"
-    UPSTREAM="registry.lollipopcloud.solutions/arm32v7/pi-hole:v3.3"
+    ARCH="arm32v7"
 fi
 
-echo "Updating"
-docker pull \$UPSTREAM
+docker pull registry.lollipopcloud.solutions/\$ARCH/pihole
 
-# Cleanup existing container
-docker stop pi-hole
-docker rm pi-hole
+docker stop pihole
+docker rm pihole
 
-# Re-run/create container with latest image
 docker run \\
-    --name pi-hole \\
+    --name pihole \\
     --restart unless-stopped \\
     --memory=128m \\
     --net docker-private \\
     --ip 172.30.5.5 \\
     -e ServerIP=172.30.5.5 \\
     -e DNS1=172.30.0.1 \\
-    -e TZ=UTC \\
-    -e WEBPASSWORD=[adecentpassword] \\
+    -e DNS2=none \\
+    -e WEBPASSWORD=BADPASSWORD \\
     -e DEBUG=1 \\
     -v /var/pihole/data:/etc/pihole \\
     -v /var/pihole/dnsmasq.d:/etc/dnsmasq.d \\
-    \$UPSTREAM
+    registry.lollipopcloud.solutions/\$ARCH/pihole
 
 EOF
 
diff --git a/services/searx.md b/services/searx.md
index 493133f..d8802de 100644
--- a/services/searx.md
+++ b/services/searx.md
@@ -21,26 +21,18 @@ cat > /scratch/docker/searx/searx.sh << EOF
 #!/bin/bash
 
 ARCH=\`arch\`
-UPSTREAM=""
-
-# Cleanup arch/container image here
 if [ \$ARCH == "aarch64" ]
 then
-    echo "64bit arm"
-    UPSTREAM="registry.lollipopcloud.solutions/arm64v8/searx:v0.14.0"
+    ARCH="arm64v8"
 else
-    echo "32bit arm"
-    UPSTREAM="registry.lollipopcloud.solutions/arm32v7/searx:v0.14.0"
+    ARCH="arm32v7"
 fi
 
-echo "Updating"
-docker pull \$UPSTREAM
+docker pull registry.lollipopcloud.solutions/\$ARCH/searx:latest
 
-# Cleanup existing container
 docker stop searx
 docker rm searx
 
-# Re-run/create container with latest image
 docker run \\
     --name searx \\
     --restart unless-stopped \\
@@ -48,8 +40,8 @@ docker run \\
     --ip 172.30.8.8 \\
     -e TZ=UTC \\
     -e DEBUG=1 \\
-    -e BASE_URL=searx.domain.tld \\
-    \$UPSTREAM
+    -e BASE_URL=searx.kemonine.online \\
+    registry.lollipopcloud.solutions/\$ARCH/searx:latest
 EOF
 
 chmod a+x /scratch/docker/searx/searx.sh