remove syncthing, update container tags

master
Paul Walko 2020-04-26 11:22:32 -04:00
parent 49ec4d478e
commit f76233b279
7 changed files with 7 additions and 47 deletions

View File

@ -9,11 +9,11 @@ docker run \
--restart unless-stopped \ --restart unless-stopped \
--env PUID=1000 \ --env PUID=1000 \
--env PGID=1000 \ --env PGID=1000 \
--env TZ=US/Easter \ --env TZ=US/Eastern \
--volume $PWD/airsonic-config:/config \ --volume $PWD/airsonic-config:/config \
--volume /bigdata/media/music:/media/music:ro \ --volume /bigdata/media/music:/media/music:ro \
--volume /bigdata/media/playlists:/media/playlists:rw \ --volume /bigdata/media/playlists:/media/playlists:rw \
--volume /bigdata/media/podcasts:/media/podcasts:rw \ --volume /bigdata/media/podcasts:/media/podcasts:rw \
--volume /media-vtluug:/media/media-vtluug:ro \ --volume /media-vtluug:/media/media-vtluug:ro \
--network pew-net \ --network pew-net \
linuxserver/airsonic:v10.5.0-ls39 linuxserver/airsonic:v10.6.1-ls59

View File

@ -8,7 +8,7 @@ docker run \
--restart unless-stopped \ --restart unless-stopped \
--env EULA=TRUE \ --env EULA=TRUE \
--env MAX_MEMORY=8G \ --env MAX_MEMORY=8G \
--env VERSION=1.14.4 \ --env VERSION=1.15.2 \
--volume $PWD/minecraft-data:/data \ --volume $PWD/minecraft-data:/data \
--publish 10.42.0.203:25565:25565 \ --publish 10.42.0.203:25565:25565 \
--publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:25565:25565 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:25565:25565 \

View File

@ -19,7 +19,7 @@ docker run \
--volume $PWD/grafana/grafana-data:/var/lib/grafana:rw \ --volume $PWD/grafana/grafana-data:/var/lib/grafana:rw \
--volume $PWD/grafana/provisioning:/etc/grafana/provisioning:rw \ --volume $PWD/grafana/provisioning:/etc/grafana/provisioning:rw \
--network pew-monitoring-net \ --network pew-monitoring-net \
grafana/grafana:6.3.7 \ grafana/grafana:6.7.3 \
&& \ && \
docker network connect pew-net monitoring_grafana 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/prometheus.yml:/etc/prometheus/prometheus.yml:ro \
--volume $PWD/prometheus/alert.rules:/etc/prometheus/alert.rules:ro \ --volume $PWD/prometheus/alert.rules:/etc/prometheus/alert.rules:ro \
--network pew-monitoring-net \ --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.path=/prometheus \
--storage.tsdb.retention.size=200GB --storage.tsdb.retention.size=200GB

View File

@ -16,13 +16,10 @@ docker run \
--volume $PWD/nginx-config:/config:rw \ --volume $PWD/nginx-config:/config:rw \
--volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \ --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \
--volume $PWD/site-confs:/config/nginx/site-confs:ro \ --volume $PWD/site-confs:/config/nginx/site-confs:ro \
--volume $PWD/../syncthing/sync:/sync-docker:ro \
--volume /bigdata/files:/files-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:80:80 \
--publish 10.42.0.203:443:443 \ --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]:80:80 \
--publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:443:443 \ --publish [2601:5c0:c100:6e65:96c6:91ff:feab:69e3]:443:443 \
--network pew-net \ --network pew-net \
linuxserver/letsencrypt:0.40.1-ls77 linuxserver/letsencrypt:1.3.0-ls110

View File

@ -37,27 +37,9 @@ server {
proxy_pass http://monitoring_grafana:3000/; 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 # Serve misc files
location /files { location /files {
alias /files-docker; alias /files-docker;
autoindex on; 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;
}
} }

View File

@ -15,4 +15,4 @@ docker run \
--volume /bigdata/media/music:/media/music:ro \ --volume /bigdata/media/music:/media/music:ro \
--volume /media-vtluug:/media/media-vtluug:ro \ --volume /media-vtluug:/media/media-vtluug:ro \
--network host \ --network host \
linuxserver/plex:1.18.2.2058-e67a4e892-ls68 linuxserver/plex:1.19.1.2701-6327e27bf-ls90

View File

@ -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