From 0aa43ea9633f79f94120d7d724e391b78340980f Mon Sep 17 00:00:00 2001 From: Paul Walko Date: Mon, 24 Jul 2023 09:05:10 -0400 Subject: [PATCH] misc updates --- fogcutter/docker/Dockerfile.caddy | 8 ++++++++ fogcutter/docker/caddy.sh | 5 ++++- fogcutter/docker/firefly.sh | 2 -- fogcutter/docker/geoserver.sh | 2 -- fogcutter/docker/gitea.sh | 2 -- fogcutter/docker/mapproxy.sh | 2 -- fogcutter/docker/mastodon.sh | 8 +++----- fogcutter/docker/plex.sh | 4 ++-- 8 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 fogcutter/docker/Dockerfile.caddy diff --git a/fogcutter/docker/Dockerfile.caddy b/fogcutter/docker/Dockerfile.caddy new file mode 100644 index 0000000..cb37859 --- /dev/null +++ b/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 diff --git a/fogcutter/docker/caddy.sh b/fogcutter/docker/caddy.sh index c4aa404..5619e1e 100755 --- a/fogcutter/docker/caddy.sh +++ b/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 () { diff --git a/fogcutter/docker/firefly.sh b/fogcutter/docker/firefly.sh index ed646b3..a875b47 100755 --- a/fogcutter/docker/firefly.sh +++ b/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 diff --git a/fogcutter/docker/geoserver.sh b/fogcutter/docker/geoserver.sh index f3587c1..2bb1d04 100755 --- a/fogcutter/docker/geoserver.sh +++ b/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 \ diff --git a/fogcutter/docker/gitea.sh b/fogcutter/docker/gitea.sh index 076b5d6..fa499af 100755 --- a/fogcutter/docker/gitea.sh +++ b/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 \ diff --git a/fogcutter/docker/mapproxy.sh b/fogcutter/docker/mapproxy.sh index de730fa..fff5ed8 100755 --- a/fogcutter/docker/mapproxy.sh +++ b/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 \ diff --git a/fogcutter/docker/mastodon.sh b/fogcutter/docker/mastodon.sh index d799b49..7b8d1e9 100755 --- a/fogcutter/docker/mastodon.sh +++ b/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 \ diff --git a/fogcutter/docker/plex.sh b/fogcutter/docker/plex.sh index e43464f..f671cfb 100755 --- a/fogcutter/docker/plex.sh +++ b/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 }