From 0b3b784b99497d06d918e03dcb316c4c5f9bb388 Mon Sep 17 00:00:00 2001
From: Paul Walko <paul@bigcavemaps.com>
Date: Sat, 28 Sep 2024 19:53:14 -0400
Subject: [PATCH] rm pngx-cave

---
 lech/docker/caddy.sh     |  2 -
 lech/docker/immich.sh    |  4 +-
 lech/docker/pngx-cave.sh | 87 ----------------------------------------
 lech/docker/pngx.sh      |  5 ++-
 4 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100755 lech/docker/pngx-cave.sh

diff --git a/lech/docker/caddy.sh b/lech/docker/caddy.sh
index e108ad7..f2d003b 100755
--- a/lech/docker/caddy.sh
+++ b/lech/docker/caddy.sh
@@ -32,8 +32,6 @@ up () {
     --volume /mammoth/caddy/logs:/logs:rw \
     --publish 443:443 \
     --publish 443:443/udp \
-    --publish [$(tailscale ip -6)]:8443:8443 \
-    --publish [$(tailscale ip -6)]:8443:8443/udp \
     --network pew-net \
     customcaddy:latest
 }
diff --git a/lech/docker/immich.sh b/lech/docker/immich.sh
index 2e433d8..6bcd160 100755
--- a/lech/docker/immich.sh
+++ b/lech/docker/immich.sh
@@ -18,7 +18,7 @@ up () {
     --volume /mammoth/photos:/external_library/photos:ro \
     --volume /etc/localtime:/etc/localtime:ro \
     --network pew-net \
-    ghcr.io/immich-app/immich-server:v1.108.0
+    ghcr.io/immich-app/immich-server:v1.116.2
 
   docker run \
     --detach \
@@ -32,7 +32,7 @@ up () {
     --env REDIS_HOSTNAME=immich-redis \
     --volume /mammoth/immich/cache:/cache:rw \
     --network pew-net \
-    ghcr.io/immich-app/immich-machine-learning:v1.108.0
+    ghcr.io/immich-app/immich-machine-learning:v1.116.2
 
   docker run \
     --detach \
diff --git a/lech/docker/pngx-cave.sh b/lech/docker/pngx-cave.sh
deleted file mode 100755
index cb7ab40..0000000
--- a/lech/docker/pngx-cave.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker run \
-    --detach \
-    --name pngx-cave-db \
-    --restart unless-stopped \
-    --env POSTGRES_DB=pngx-cave_db \
-    --env POSTGRES_USER=pngx-cave_user \
-    --env POSTGRES_PASSWORD=pngx-cave_pw \
-    --volume /mammoth/pngx-cave/postgres:/var/lib/postgresql/data:rw \
-    --network pew-net \
-    docker.io/library/postgres:16
-
-  docker run \
-    --detach \
-    --name pngx-cave-redis \
-    --restart unless-stopped \
-    --volume /mammoth/pngx-cave/redis:/data:rw \
-    --network pew-net \
-    docker.io/library/redis:7
-
-  echo 'Waiting 5 seconds for postgres to start up...'
-  sleep 5
-
-  # Exposed on port 8000 in pew-net  
-  docker run \
-    --detach \
-    --name pngx-cave \
-    --restart unless-stopped \
-    --env PAPERLESS_DBHOST=pngx-cave-db \
-    --env PAPERLESS_DBNAME=pngx-cave_db \
-    --env PAPERLESS_DBPASS=pngx-cave_pw \
-    --env PAPERLESS_DBUSER=pngx-cave_user \
-    --env PAPERLESS_EMAIL_FROM=paul@bigcavemaps.com \
-    --env PAPERLESS_EMAIL_HOST=smtp.postmarkapp.com \
-    --env PAPERLESS_EMAIL_PORT=587 \
-    --env PAPERLESS_EMAIL_TLS=True \
-    --env PAPERLESS_OCR_LANGUAGE=eng \
-    --env PAPERLESS_OCR_USER_ARGS='{"continue_on_soft_render_error": true}' \
-    --env PAPERLESS_REDIS=redis://pngx-cave-redis:6379 \
-    --env PAPERLESS_TASK_WORKERS=10 \
-    --env PAPERLESS_TIKA_ENABLED=1 \
-    --env PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://pngx-cave-gotenberg:3000 \
-    --env PAPERLESS_TIKA_ENDPOINT=http://pngx-cave-tika:9998 \
-    --env PAPERLESS_TIME_ZONE=America/New_York \
-    --env PAPERLESS_URL=https://pngx.caving.dev \
-    --env USERMAP_UID=1000 \
-    --env USERMAP_GID=1000 \
-    --env-file $HOME/scripts-private/lech/pngx-cave.env \
-    --volume /mammoth/pngx-cave/pngx/data:/usr/src/paperless/data:rw \
-    --volume /mammoth/pngx-cave/pngx/media:/usr/src/paperless/media:rw \
-    --volume /mammoth/pngx-cave/pngx/export:/usr/src/paperless/export:rw \
-    --volume /mammoth/pngx-cave/pngx/consume:/usr/src/paperless/consume:rw \
-    --network pew-net \
-    ghcr.io/paperless-ngx/paperless-ngx:latest
-
-  docker run \
-    --detach \
-    --name pngx-cave-gotenberg \
-    --network pew-net \
-    docker.io/gotenberg/gotenberg:8.7 gotenberg --chromium-disable-javascript=true --chromium-allow-list=file:///tmp/.*
-
-  docker run \
-    --detach \
-    --name pngx-cave-tika \
-    --restart unless-stopped \
-    docker.io/apache/tika:latest
-}
-
-down () {
-  docker stop pngx-cave-db || true
-  docker rm pngx-cave-db || true
-  docker stop pngx-cave-redis || true
-  docker rm pngx-cave-redis || true
-  docker stop pngx-cave || true
-  docker rm pngx-cave || true
-  docker stop pngx-cave-gotenberg || true
-  docker rm pngx-cave-gotenberg || true
-  docker stop pngx-cave-tika || true
-  docker rm pngx-cave-tika || true
-}
-
-
-$@
diff --git a/lech/docker/pngx.sh b/lech/docker/pngx.sh
index 74797fb..1ae9f36 100755
--- a/lech/docker/pngx.sh
+++ b/lech/docker/pngx.sh
@@ -44,7 +44,7 @@ up () {
     --env PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://pngx-gotenberg:3000 \
     --env PAPERLESS_TIKA_ENDPOINT=http://pngx-tika:9998 \
     --env PAPERLESS_TIME_ZONE=America/New_York \
-    --env PAPERLESS_URL=https://pngx.bigcavemaps.com:8443 \
+    --env PAPERLESS_URL=https://pngx.bigcavemaps.com \
     --env USERMAP_UID=1000 \
     --env USERMAP_GID=1000 \
     --env-file $HOME/scripts-private/lech/pngx.env \
@@ -53,7 +53,7 @@ up () {
     --volume /mammoth/pngx/pngx/export:/usr/src/paperless/export:rw \
     --volume /mammoth/pngx/pngx/consume:/usr/src/paperless/consume:rw \
     --network pew-net \
-    ghcr.io/paperless-ngx/paperless-ngx:latest
+    ghcr.io/paperless-ngx/paperless-ngx:2.12
 
   docker run \
     --detach \
@@ -65,6 +65,7 @@ up () {
     --detach \
     --name pngx-tika \
     --restart unless-stopped \
+    --network pew-net \
     docker.io/apache/tika:latest
 }