misc updates

fogcutter/docker/Dockerfile.caddy

@@ -0,0 +1,8 @@
+FROM caddy:2.6.2-builder AS builder
+
+RUN xcaddy build \
+  --with github.com/caddyserver/replace-response
+
+FROM caddy:2.6.2
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy

fogcutter/docker/caddy.sh

@@ -6,6 +6,8 @@ up () {
   docker network create pew-net || true
   
   # main caddy container
+  docker build -t customcaddy:latest -f Dockerfile.caddy .
+
   docker run \
     --detach \
     --name caddy \
@@ -14,12 +16,13 @@ up () {
     --volume /bigdata/k8s-config/caddy/Caddyfile:/etc/caddy/Caddyfile:ro \
     --volume /bigdata/k8s-config/caddy/data:/data:rw \
     --volume /bigdata/gis/bigcavemaps.com:/www/bigcavemaps.com:ro \
+    --volume /bigdata/gis/source:/gis/source:ro \
     --volume /bigdata/files:/www/seaturtle.pw_files:ro \
     --publish 80:80 \
     --publish 443:443 \
     --publish 443:443/udp \
     --network pew-net \
-    docker.io/caddy:2.6.2
+    customcaddy:latest
 }
 
 down () {

fogcutter/docker/firefly.sh

@@ -6,8 +6,6 @@ set -e
 # https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
 
 up () {
-  docker network create pew-net || true
-
   # Exposed on port 8080 in pew-net
   # env options: https://raw.githubusercontent.com/firefly-iii/firefly-iii/main/.env.example
   # Create firefly.env with APP_KEY

fogcutter/docker/geoserver.sh

@@ -3,8 +3,6 @@
 set -e
 
 up () {
-  docker network create pew-net || true
-
   # Exposed on port 8080 in pew-net  
   docker run \
     --detach \

fogcutter/docker/gitea.sh

@@ -3,8 +3,6 @@
 set -e
 
 up () {
-  docker network create pew-net || true
-
   # Exposed on port 3000 in pew-net  
   docker run \
     --detach \

fogcutter/docker/mapproxy.sh

@@ -3,8 +3,6 @@
 set -e
 
 up () {
-  docker network create pew-net || true
-
   # Exposed on port 8080 in pew-net  
   docker run \
     --detach \

fogcutter/docker/mastodon.sh

@@ -13,8 +13,6 @@ DB_PASS=mastodon
 DB_PORT=5432
 
 up () {
-  docker network create pew-net || true
-
   docker run \
     --detach \
     --name mastodon-web \
@@ -31,7 +29,7 @@ up () {
     --env DB_PORT=$DB_PORT \
     --volume /bigdata/k8s-config/mastodon/public/system:/mastodon/public/system:rw \
     --network pew-net \
-    docker.io/tootsuite/mastodon:v4.0.2 bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
+    ghcr.io/mastodon/mastodon:v4.1.5 bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
 
   docker run \
     --detach \
@@ -48,7 +46,7 @@ up () {
     --env DB_PASS=$DB_PASS \
     --env DB_PORT=$DB_PORT \
     --network pew-net \
-    docker.io/tootsuite/mastodon:v4.0.2 node ./streaming
+    ghcr.io/mastodon/mastodon:v4.1.5 node ./streaming
 
   docker run \
     --detach \
@@ -66,7 +64,7 @@ up () {
     --env DB_PORT=$DB_PORT \
     --volume /bigdata/k8s-config/mastodon/public/system:/mastodon/public/system:rw \
     --network pew-net \
-    docker.io/tootsuite/mastodon:v4.0.2 bundle exec sidekiq
+    ghcr.io/mastodon/mastodon:v4.1.5 bundle exec sidekiq
 
   # may have to run db:migrate if things don't work right away
   docker run \

fogcutter/docker/plex.sh

@@ -3,8 +3,6 @@
 set -e
 
 up () {
-  docker network create pew-net || true
-
   # Exposed on port 32400 in pew-net  
   docker run \
     --detach \
@@ -18,6 +16,8 @@ up () {
     --volume /bigdata/media/audiobooks:/media/audiobooks:ro \
     --volume /bigdata/media/music:/media/music:ro \
     --volume /media-vtluug:/media/media-vtluug:ro \
+    --volume /bigdata/tmp/plex/transcode:/transcode:rw \
+    --device=/dev/dri:/dev/dri:rw \
     --network pew-net \
     ghcr.io/linuxserver/plex:latest
 }