fogcutter/docker/Dockerfile.caddy

@@ -1,8 +0,0 @@
-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,8 +6,6 @@ up () {
   docker network create pew-net || true
   
   # main caddy container
-  docker build -t customcaddy:latest -f Dockerfile.caddy .
-
   docker run \
     --detach \
     --name caddy \
@@ -16,13 +14,12 @@ 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 \
-    customcaddy:latest
+    docker.io/caddy:2.6.2
 }
 
 down () {

fogcutter/docker/firefly.sh

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

fogcutter/docker/gitea.sh

@@ -3,6 +3,8 @@
 set -e
 
 up () {
+  docker network create pew-net || true
+
   # Exposed on port 3000 in pew-net  
   docker run \
     --detach \
@@ -22,7 +24,7 @@ up () {
     --volume /etc/timezone:/etc/timezone:ro \
     --publish 2222:2222 \
     --network pew-net \
-    docker.io/gitea/gitea:1.20
+    docker.io/gitea/gitea:latest
 }
 
 down () {

fogcutter/docker/mapproxy.sh

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

fogcutter/docker/mastodon.sh

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

fogcutter/docker/plex.sh

@@ -3,6 +3,8 @@
 set -e
 
 up () {
+  docker network create pew-net || true
+
   # Exposed on port 32400 in pew-net  
   docker run \
     --detach \
@@ -16,8 +18,6 @@ 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
 }