From f76233b2794f67f4791b3250704c9c5f61b9f8fb Mon Sep 17 00:00:00 2001 From: Paul Walko Date: Sun, 26 Apr 2020 11:22:32 -0400 Subject: [PATCH] remove syncthing, update container tags --- fogcutter/docker/airsonic/launch.sh | 4 ++-- fogcutter/docker/minecraft/launch.sh | 2 +- fogcutter/docker/monitoring/launch.sh | 4 ++-- fogcutter/docker/nginx/launch.sh | 5 +---- .../nginx/site-confs/seaturtle.pw.enabled | 18 ------------------ fogcutter/docker/plex/launch.sh | 2 +- fogcutter/docker/syncthing/launch.sh | 19 ------------------- 7 files changed, 7 insertions(+), 47 deletions(-) delete mode 100755 fogcutter/docker/syncthing/launch.sh diff --git a/fogcutter/docker/airsonic/launch.sh b/fogcutter/docker/airsonic/launch.sh index ecfc7b6..4b138b3 100755 --- a/fogcutter/docker/airsonic/launch.sh +++ b/fogcutter/docker/airsonic/launch.sh @@ -9,11 +9,11 @@ docker run \ --restart unless-stopped \ --env PUID=1000 \ --env PGID=1000 \ - --env TZ=US/Easter \ + --env TZ=US/Eastern \ --volume $PWD/airsonic-config:/config \ --volume /bigdata/media/music:/media/music:ro \ --volume /bigdata/media/playlists:/media/playlists:rw \ --volume /bigdata/media/podcasts:/media/podcasts:rw \ --volume /media-vtluug:/media/media-vtluug:ro \ --network pew-net \ - linuxserver/airsonic:v10.5.0-ls39 + linuxserver/airsonic:v10.6.1-ls59 diff --git a/fogcutter/docker/minecraft/launch.sh b/fogcutter/docker/minecraft/launch.sh index 6718938..aa19219 100755 --- a/fogcutter/docker/minecraft/launch.sh +++ b/fogcutter/docker/minecraft/launch.sh @@ -8,7 +8,7 @@ docker run \ --restart unless-stopped \ --env EULA=TRUE \ --env MAX_MEMORY=8G \ - --env VERSION=1.14.4 \ + --env VERSION=1.15.2 \ --volume $PWD/minecraft-data:/data \ --publish 10.42.0.203:25565:25565 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:25565:25565 \ diff --git a/fogcutter/docker/monitoring/launch.sh b/fogcutter/docker/monitoring/launch.sh index c1485af..c9bd2b5 100755 --- a/fogcutter/docker/monitoring/launch.sh +++ b/fogcutter/docker/monitoring/launch.sh @@ -19,7 +19,7 @@ docker run \ --volume $PWD/grafana/grafana-data:/var/lib/grafana:rw \ --volume $PWD/grafana/provisioning:/etc/grafana/provisioning:rw \ --network pew-monitoring-net \ - grafana/grafana:6.3.7 \ + grafana/grafana:6.7.3 \ && \ docker network connect pew-net monitoring_grafana @@ -33,7 +33,7 @@ docker run \ --volume $PWD/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro \ --volume $PWD/prometheus/alert.rules:/etc/prometheus/alert.rules:ro \ --network pew-monitoring-net \ - prom/prometheus:v2.14.0 --config.file=/etc/prometheus/prometheus.yml \ + prom/prometheus:v2.17.2 --config.file=/etc/prometheus/prometheus.yml \ --storage.tsdb.path=/prometheus \ --storage.tsdb.retention.size=200GB diff --git a/fogcutter/docker/nginx/launch.sh b/fogcutter/docker/nginx/launch.sh index 70d1006..9cd6fd7 100755 --- a/fogcutter/docker/nginx/launch.sh +++ b/fogcutter/docker/nginx/launch.sh @@ -16,13 +16,10 @@ docker run \ --volume $PWD/nginx-config:/config:rw \ --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \ --volume $PWD/site-confs:/config/nginx/site-confs:ro \ - --volume $PWD/../syncthing/sync:/sync-docker:ro \ --volume /bigdata/files:/files-docker:ro \ - --volume $PWD/syncthing-htpasswd:/config/nginx/syncthing-htpasswd:ro \ - --volume $PWD/sync-htpasswd:/config/nginx/sync-htpasswd:ro \ --publish 10.42.0.203:80:80 \ --publish 10.42.0.203:443:443 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:80:80 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:443:443 \ --network pew-net \ - linuxserver/letsencrypt:0.40.1-ls77 + linuxserver/letsencrypt:1.3.0-ls110 diff --git a/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled b/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled index 225fee0..9ce19b8 100644 --- a/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled +++ b/fogcutter/docker/nginx/site-confs/seaturtle.pw.enabled @@ -37,27 +37,9 @@ server { proxy_pass http://monitoring_grafana:3000/; } - # Proxy syncthing - location /syncthing/ { - auth_basic "not today buddy"; - auth_basic_user_file /config/nginx/syncthing-htpasswd; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-proto $scheme; - proxy_pass http://syncthing:8384/; - } - # Serve misc files location /files { alias /files-docker; autoindex on; } - - # Serve syncthing files - location /sync { - auth_basic "nope definitely not today buddy"; - auth_basic_user_file /config/nginx/sync-htpasswd; - alias /sync-docker; - autoindex on; - } } diff --git a/fogcutter/docker/plex/launch.sh b/fogcutter/docker/plex/launch.sh index f4e63e8..838e7b4 100755 --- a/fogcutter/docker/plex/launch.sh +++ b/fogcutter/docker/plex/launch.sh @@ -15,4 +15,4 @@ docker run \ --volume /bigdata/media/music:/media/music:ro \ --volume /media-vtluug:/media/media-vtluug:ro \ --network host \ - linuxserver/plex:1.18.2.2058-e67a4e892-ls68 + linuxserver/plex:1.19.1.2701-6327e27bf-ls90 diff --git a/fogcutter/docker/syncthing/launch.sh b/fogcutter/docker/syncthing/launch.sh deleted file mode 100755 index 3fc8040..0000000 --- a/fogcutter/docker/syncthing/launch.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Assumes pew-net exists -# Create mounted dirs (as non-root) before launching - -docker run \ - --name syncthing \ - --detach \ - --restart unless-stopped \ - --env PUID=1000 \ - --env PGID=1000 \ - --env TZ=Europe/London \ - --env UMASK_SET=022 \ - --volume $PWD/syncthing-config:/config:rw \ - --volume $PWD/syncthing-sync:/sync-docker:rw \ - --publish 22000:22000 \ - --publish 21027:21027/udp \ - --network pew-net \ - linuxserver/syncthing:v1.3.1-ls21