From dc2f4dc967fc03c13f94a7f4ee9fe0334ef7b251 Mon Sep 17 00:00:00 2001 From: technorabilia Date: Thu, 15 Jul 2021 00:46:59 +0000 Subject: [PATCH] Workflow update --- lsio/cloud9/docker-compose.yaml | 2 +- lsio/cloud9/docker-run.sh | 2 +- lsio/cloud9/run-once.sh | 1 - lsio/emby/docker-compose.yaml | 2 +- lsio/emby/docker-run.sh | 2 +- lsio/emby/run-once.sh | 1 - lsio/jellyfin/docker-compose.yaml | 2 +- lsio/jellyfin/docker-run.sh | 2 +- lsio/jellyfin/run-once.sh | 1 - lsio/rdesktop/docker-compose.yaml | 2 +- lsio/rdesktop/docker-run.sh | 2 +- lsio/rdesktop/run-once.sh | 1 - lsio/scrutiny/docker-compose.yaml | 2 +- lsio/scrutiny/docker-run.sh | 2 +- lsio/scrutiny/run-once.sh | 1 - lsio/syslog-ng/docker-compose.yaml | 8 ++++---- lsio/syslog-ng/docker-run.sh | 8 ++++---- lsio/syslog-ng/run-once.sh | 1 - lsio/taisun/docker-run.sh | 2 +- lsio/taisun/run-once.sh | 1 - lsio/webtop/docker-compose.yaml | 2 +- lsio/webtop/docker-run.sh | 2 +- lsio/webtop/run-once.sh | 1 - lsio/wireguard/docker-compose.yaml | 2 +- lsio/wireguard/docker-run.sh | 2 +- lsio/wireguard/run-once.sh | 1 - 26 files changed, 23 insertions(+), 32 deletions(-) diff --git a/lsio/cloud9/docker-compose.yaml b/lsio/cloud9/docker-compose.yaml index 61aab23..c74f968 100644 --- a/lsio/cloud9/docker-compose.yaml +++ b/lsio/cloud9/docker-compose.yaml @@ -27,7 +27,7 @@ services: # Optionally if you want to mount up a local folder of code instead of checking out - ${BASEDIR:-/volume1/docker}/cloud9/code:/code # optional # Needed if you plan to use Docker or compose commands - - ${BASEDIR:-/volume1/docker}/cloud9/var/run/docker.sock:/var/run/docker.sock # optional + - /var/run/docker.sock:/var/run/docker.sock # optional ports: # The port for the Cloud9 web interface - 8000:8000 diff --git a/lsio/cloud9/docker-run.sh b/lsio/cloud9/docker-run.sh index c9469f1..c753a69 100644 --- a/lsio/cloud9/docker-run.sh +++ b/lsio/cloud9/docker-run.sh @@ -14,6 +14,6 @@ docker run -d \ -p 8000:8000 `# The port for the Cloud9 web interface` \ -v ${BASEDIR:-/volume1/docker}/cloud9/config:/config `# Configuration files.` \ -v ${BASEDIR:-/volume1/docker}/cloud9/code:/code `# optional` `# Optionally if you want to mount up a local folder of code instead of checking out` \ - -v ${BASEDIR:-/volume1/docker}/cloud9/var/run/docker.sock:/var/run/docker.sock `# optional` `# Needed if you plan to use Docker or compose commands` \ + -v /var/run/docker.sock:/var/run/docker.sock `# optional` `# Needed if you plan to use Docker or compose commands` \ --restart unless-stopped \ ghcr.io/linuxserver/cloud9 diff --git a/lsio/cloud9/run-once.sh b/lsio/cloud9/run-once.sh index 69f8c1c..b35e945 100644 --- a/lsio/cloud9/run-once.sh +++ b/lsio/cloud9/run-once.sh @@ -2,4 +2,3 @@ ln -s ../docker-env.cfg ./.env . ./.env mkdir -p ${BASEDIR:-/volume1/docker}/cloud9/config mkdir -p ${BASEDIR:-/volume1/docker}/cloud9/code `#optional` -mkdir -p ${BASEDIR:-/volume1/docker}/cloud9/var/run/docker.sock `#optional` diff --git a/lsio/emby/docker-compose.yaml b/lsio/emby/docker-compose.yaml index 87cf285..0537e0f 100644 --- a/lsio/emby/docker-compose.yaml +++ b/lsio/emby/docker-compose.yaml @@ -23,7 +23,7 @@ services: # Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. - ${BASEDIR:-/volume1/docker}/emby/data/movies:/data/movies # Path for Raspberry Pi OpenMAX libs *optional*. - - ${BASEDIR:-/volume1/docker}/emby/opt/vc/lib:/opt/vc/lib # optional + - /opt/vc/lib:/opt/vc/lib # optional ports: # Http webUI. - 8096:8096 diff --git a/lsio/emby/docker-run.sh b/lsio/emby/docker-run.sh index 1266a6e..1632915 100644 --- a/lsio/emby/docker-run.sh +++ b/lsio/emby/docker-run.sh @@ -13,7 +13,7 @@ docker run -d \ -v ${BASEDIR:-/volume1/docker}/emby/config:/config `# Emby data storage location. *This can grow very large, 50gb+ is likely for a large collection.*` \ -v ${BASEDIR:-/volume1/docker}/emby/data/tvshows:/data/tvshows `# Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc.` \ -v ${BASEDIR:-/volume1/docker}/emby/data/movies:/data/movies `# Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc.` \ - -v ${BASEDIR:-/volume1/docker}/emby/opt/vc/lib:/opt/vc/lib `# optional` `# Path for Raspberry Pi OpenMAX libs *optional*.` \ + -v /opt/vc/lib:/opt/vc/lib `# optional` `# Path for Raspberry Pi OpenMAX libs *optional*.` \ --device /dev/dri:/dev/dri `# optional` `# Only needed if you want to use your Intel or AMD GPU for hardware accelerated video encoding (vaapi).` \ --device /dev/vchiq:/dev/vchiq `# optional` `# Only needed if you want to use your Raspberry Pi OpenMax video encoding (Bellagio).` \ --device /dev/video10:/dev/video10 `# optional` `# Only needed if you want to use your Raspberry Pi V4L2 video encoding.` \ diff --git a/lsio/emby/run-once.sh b/lsio/emby/run-once.sh index d98a3b0..37714e5 100644 --- a/lsio/emby/run-once.sh +++ b/lsio/emby/run-once.sh @@ -3,4 +3,3 @@ ln -s ../docker-env.cfg ./.env mkdir -p ${BASEDIR:-/volume1/docker}/emby/config mkdir -p ${BASEDIR:-/volume1/docker}/emby/data/tvshows mkdir -p ${BASEDIR:-/volume1/docker}/emby/data/movies -mkdir -p ${BASEDIR:-/volume1/docker}/emby/opt/vc/lib `#optional` diff --git a/lsio/jellyfin/docker-compose.yaml b/lsio/jellyfin/docker-compose.yaml index 8975402..51a5db1 100644 --- a/lsio/jellyfin/docker-compose.yaml +++ b/lsio/jellyfin/docker-compose.yaml @@ -30,7 +30,7 @@ services: # Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. - ${BASEDIR:-/volume1/docker}/jellyfin/data/movies:/data/movies # Path for Raspberry Pi OpenMAX libs *optional*. - - ${BASEDIR:-/volume1/docker}/jellyfin/opt/vc/lib:/opt/vc/lib # optional + - /opt/vc/lib:/opt/vc/lib # optional ports: # Http webUI. - 8096:8096 diff --git a/lsio/jellyfin/docker-run.sh b/lsio/jellyfin/docker-run.sh index 259aef5..c68bd33 100644 --- a/lsio/jellyfin/docker-run.sh +++ b/lsio/jellyfin/docker-run.sh @@ -21,7 +21,7 @@ docker run -d \ -v ${BASEDIR:-/volume1/docker}/jellyfin/config:/config `# Jellyfin data storage location. *This can grow very large, 50gb+ is likely for a large collection.*` \ -v ${BASEDIR:-/volume1/docker}/jellyfin/data/tvshows:/data/tvshows `# Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc.` \ -v ${BASEDIR:-/volume1/docker}/jellyfin/data/movies:/data/movies `# Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc.` \ - -v ${BASEDIR:-/volume1/docker}/jellyfin/opt/vc/lib:/opt/vc/lib `# optional` `# Path for Raspberry Pi OpenMAX libs *optional*.` \ + -v /opt/vc/lib:/opt/vc/lib `# optional` `# Path for Raspberry Pi OpenMAX libs *optional*.` \ --device /dev/dri:/dev/dri `# optional` `# Only needed if you want to use your Intel GPU for hardware accelerated video encoding (vaapi).` \ --device /dev/vcsm:/dev/vcsm `# optional` `# Only needed if you want to use your Raspberry Pi MMAL video decoding (Enabled as OpenMax H264 decode in gui settings).` \ --device /dev/vchiq:/dev/vchiq `# optional` `# Only needed if you want to use your Raspberry Pi OpenMax video encoding.` \ diff --git a/lsio/jellyfin/run-once.sh b/lsio/jellyfin/run-once.sh index 1d4ccf5..96c5702 100644 --- a/lsio/jellyfin/run-once.sh +++ b/lsio/jellyfin/run-once.sh @@ -3,4 +3,3 @@ ln -s ../docker-env.cfg ./.env mkdir -p ${BASEDIR:-/volume1/docker}/jellyfin/config mkdir -p ${BASEDIR:-/volume1/docker}/jellyfin/data/tvshows mkdir -p ${BASEDIR:-/volume1/docker}/jellyfin/data/movies -mkdir -p ${BASEDIR:-/volume1/docker}/jellyfin/opt/vc/lib `#optional` diff --git a/lsio/rdesktop/docker-compose.yaml b/lsio/rdesktop/docker-compose.yaml index af547ea..f5f724f 100644 --- a/lsio/rdesktop/docker-compose.yaml +++ b/lsio/rdesktop/docker-compose.yaml @@ -17,7 +17,7 @@ services: - TZ=${TZ:-Europe/Amsterdam} volumes: # Docker Socket on the system, if you want to use Docker in the container - - ${BASEDIR:-/volume1/docker}/rdesktop/var/run/docker.sock:/var/run/docker.sock # optional + - /var/run/docker.sock:/var/run/docker.sock # optional # abc users home directory - ${BASEDIR:-/volume1/docker}/rdesktop/config:/config # optional ports: diff --git a/lsio/rdesktop/docker-run.sh b/lsio/rdesktop/docker-run.sh index f60183d..e9a74a8 100644 --- a/lsio/rdesktop/docker-run.sh +++ b/lsio/rdesktop/docker-run.sh @@ -9,7 +9,7 @@ docker run -d \ -e PGID=${PGID:-100} `# for UserID` \ -e TZ=${TZ:-Europe/Amsterdam} `# Specify a timezone to use for example Europe/Amsterdam` \ -p 3389:3389 `# RDP access port` \ - -v ${BASEDIR:-/volume1/docker}/rdesktop/var/run/docker.sock:/var/run/docker.sock `# optional` `# Docker Socket on the system, if you want to use Docker in the container` \ + -v /var/run/docker.sock:/var/run/docker.sock `# optional` `# Docker Socket on the system, if you want to use Docker in the container` \ -v ${BASEDIR:-/volume1/docker}/rdesktop/config:/config `# optional` `# abc users home directory` \ --shm-size="1gb" `# optional` \ --restart unless-stopped \ diff --git a/lsio/rdesktop/run-once.sh b/lsio/rdesktop/run-once.sh index be7f64f..72cf229 100644 --- a/lsio/rdesktop/run-once.sh +++ b/lsio/rdesktop/run-once.sh @@ -1,4 +1,3 @@ ln -s ../docker-env.cfg ./.env . ./.env -mkdir -p ${BASEDIR:-/volume1/docker}/rdesktop/var/run/docker.sock `#optional` mkdir -p ${BASEDIR:-/volume1/docker}/rdesktop/config `#optional` diff --git a/lsio/scrutiny/docker-compose.yaml b/lsio/scrutiny/docker-compose.yaml index 84afaed..2af5647 100644 --- a/lsio/scrutiny/docker-compose.yaml +++ b/lsio/scrutiny/docker-compose.yaml @@ -29,7 +29,7 @@ services: # Where config is stored. - ${BASEDIR:-/volume1/docker}/scrutiny/config:/config # Provides necessary metadata to Scrutiny. - - ${BASEDIR:-/volume1/docker}/scrutiny/run/udev:ro:/run/udev:ro + - /run/udev:ro:/run/udev:ro ports: # Port for scrutiny's web interface and API. - 8080:8080 diff --git a/lsio/scrutiny/docker-run.sh b/lsio/scrutiny/docker-run.sh index e3d8b69..a5050b5 100644 --- a/lsio/scrutiny/docker-run.sh +++ b/lsio/scrutiny/docker-run.sh @@ -16,7 +16,7 @@ docker run -d \ -e SCRUTINY_COLLECTOR=true `# # optional - Run the metrics collector.` \ -p 8080:8080 `# Port for scrutiny's web interface and API.` \ -v ${BASEDIR:-/volume1/docker}/scrutiny/config:/config `# Where config is stored.` \ - -v ${BASEDIR:-/volume1/docker}/scrutiny/run/udev:ro:/run/udev:ro `# Provides necessary metadata to Scrutiny.` \ + -v /run/udev:ro:/run/udev:ro `# Provides necessary metadata to Scrutiny.` \ --device /dev/sda:/dev/sda `# This is how Scrutiny accesses drives. Optionally supply `/dev:/dev` instead for all devices.` \ --device /dev/sdb:/dev/sdb `# A second drive.` \ --device /dev/nvme1n1:/dev/nvme1n1 `# An NVMe drive. NVMe requires `--cap-add=SYS_ADMIN`.` \ diff --git a/lsio/scrutiny/run-once.sh b/lsio/scrutiny/run-once.sh index 70ffbec..b578fcc 100644 --- a/lsio/scrutiny/run-once.sh +++ b/lsio/scrutiny/run-once.sh @@ -1,4 +1,3 @@ ln -s ../docker-env.cfg ./.env . ./.env mkdir -p ${BASEDIR:-/volume1/docker}/scrutiny/config -mkdir -p ${BASEDIR:-/volume1/docker}/scrutiny/run/udev:ro diff --git a/lsio/syslog-ng/docker-compose.yaml b/lsio/syslog-ng/docker-compose.yaml index 1d5414d..f7042ae 100644 --- a/lsio/syslog-ng/docker-compose.yaml +++ b/lsio/syslog-ng/docker-compose.yaml @@ -19,12 +19,12 @@ services: # Stores config and application files - ${BASEDIR:-/volume1/docker}/syslog-ng/config:/config # Stores logs collected by the syslog-ng service - - ${BASEDIR:-/volume1/docker}/syslog-ng/var/log:/var/log # optional + - /var/log:/var/log # optional ports: # Syslog UDP - - 514:5514 + - 514:5514/udp # Syslog TCP - - 601:6601 + - 601:6601/tcp # Syslog TLS - - 6514:6514 + - 6514:6514/tcp restart: unless-stopped diff --git a/lsio/syslog-ng/docker-run.sh b/lsio/syslog-ng/docker-run.sh index 60ff719..d70d5e6 100644 --- a/lsio/syslog-ng/docker-run.sh +++ b/lsio/syslog-ng/docker-run.sh @@ -8,10 +8,10 @@ docker run -d \ -e PUID=${PUID:-1024} `# for GroupID` \ -e PGID=${PGID:-100} `# for UserID` \ -e TZ=${TZ:-Europe/Amsterdam} `# Specify a timezone to use for example Europe/Amsterdam` \ - -p 514:5514 `# Syslog UDP` \ - -p 601:6601 `# Syslog TCP` \ - -p 6514:6514 `# Syslog TLS` \ + -p 514:5514/udp `# Syslog UDP` \ + -p 601:6601/tcp `# Syslog TCP` \ + -p 6514:6514/tcp `# Syslog TLS` \ -v ${BASEDIR:-/volume1/docker}/syslog-ng/config:/config `# Stores config and application files` \ - -v ${BASEDIR:-/volume1/docker}/syslog-ng/var/log:/var/log `# optional` `# Stores logs collected by the syslog-ng service` \ + -v /var/log:/var/log `# optional` `# Stores logs collected by the syslog-ng service` \ --restart unless-stopped \ ghcr.io/linuxserver/syslog-ng diff --git a/lsio/syslog-ng/run-once.sh b/lsio/syslog-ng/run-once.sh index 639469d..ad1ab1c 100644 --- a/lsio/syslog-ng/run-once.sh +++ b/lsio/syslog-ng/run-once.sh @@ -1,4 +1,3 @@ ln -s ../docker-env.cfg ./.env . ./.env mkdir -p ${BASEDIR:-/volume1/docker}/syslog-ng/config -mkdir -p ${BASEDIR:-/volume1/docker}/syslog-ng/var/log `#optional` diff --git a/lsio/taisun/docker-run.sh b/lsio/taisun/docker-run.sh index 7fa20d8..da9f9f1 100644 --- a/lsio/taisun/docker-run.sh +++ b/lsio/taisun/docker-run.sh @@ -12,6 +12,6 @@ source ./.env docker run -d \ --name=taisun \ -p 3000:3000 `# Taisun WebUI.` \ - -v ${BASEDIR:-/volume1/docker}/taisun/var/run/docker.sock:/var/run/docker.sock `# Docker Socket on the system` \ + -v /var/run/docker.sock:/var/run/docker.sock `# Docker Socket on the system` \ --restart unless-stopped \ ghcr.io/linuxserver/taisun diff --git a/lsio/taisun/run-once.sh b/lsio/taisun/run-once.sh index fd47dc2..8aeac9a 100644 --- a/lsio/taisun/run-once.sh +++ b/lsio/taisun/run-once.sh @@ -1,3 +1,2 @@ ln -s ../docker-env.cfg ./.env . ./.env -mkdir -p ${BASEDIR:-/volume1/docker}/taisun/var/run/docker.sock diff --git a/lsio/webtop/docker-compose.yaml b/lsio/webtop/docker-compose.yaml index f616b62..7f72bfb 100644 --- a/lsio/webtop/docker-compose.yaml +++ b/lsio/webtop/docker-compose.yaml @@ -22,7 +22,7 @@ services: # abc users home directory - ${BASEDIR:-/volume1/docker}/webtop/config:/config # Docker Socket on the system, if you want to use Docker in the container - - ${BASEDIR:-/volume1/docker}/webtop/var/run/docker.sock:/var/run/docker.sock # optional + - /var/run/docker.sock:/var/run/docker.sock # optional ports: # Web Desktop GUI - 3000:3000 diff --git a/lsio/webtop/docker-run.sh b/lsio/webtop/docker-run.sh index 299431e..2ac5548 100644 --- a/lsio/webtop/docker-run.sh +++ b/lsio/webtop/docker-run.sh @@ -12,7 +12,7 @@ docker run -d \ -e SUBFOLDER=/ `# optional` `# Specify a subfolder to use with reverse proxies, IE `/subfolder/`` \ -p 3000:3000 `# Web Desktop GUI` \ -v ${BASEDIR:-/volume1/docker}/webtop/config:/config `# abc users home directory` \ - -v ${BASEDIR:-/volume1/docker}/webtop/var/run/docker.sock:/var/run/docker.sock `# optional` `# Docker Socket on the system, if you want to use Docker in the container` \ + -v /var/run/docker.sock:/var/run/docker.sock `# optional` `# Docker Socket on the system, if you want to use Docker in the container` \ --shm-size="1gb" `# optional` \ --restart unless-stopped \ ghcr.io/linuxserver/webtop diff --git a/lsio/webtop/run-once.sh b/lsio/webtop/run-once.sh index 57e3dca..139eeac 100644 --- a/lsio/webtop/run-once.sh +++ b/lsio/webtop/run-once.sh @@ -1,4 +1,3 @@ ln -s ../docker-env.cfg ./.env . ./.env mkdir -p ${BASEDIR:-/volume1/docker}/webtop/config -mkdir -p ${BASEDIR:-/volume1/docker}/webtop/var/run/docker.sock `#optional` diff --git a/lsio/wireguard/docker-compose.yaml b/lsio/wireguard/docker-compose.yaml index 8c6b360..d89966a 100644 --- a/lsio/wireguard/docker-compose.yaml +++ b/lsio/wireguard/docker-compose.yaml @@ -41,7 +41,7 @@ services: # Contains all relevant configuration files. - ${BASEDIR:-/volume1/docker}/wireguard/config:/config # Maps host's modules folder. - - ${BASEDIR:-/volume1/docker}/wireguard/lib/modules:/lib/modules + - /lib/modules:/lib/modules ports: # wireguard port - 51820:51820/udp diff --git a/lsio/wireguard/docker-run.sh b/lsio/wireguard/docker-run.sh index 4692997..8fcacec 100644 --- a/lsio/wireguard/docker-run.sh +++ b/lsio/wireguard/docker-run.sh @@ -25,7 +25,7 @@ docker run -d \ -e ALLOWEDIPS=0.0.0.0/0 `# optional` `# The IPs/Ranges that the peers will be able to reach using the VPN connection. If not specified the default value is: '0.0.0.0/0, ::0/0' This will cause ALL traffic to route through the VPN, if you want split tunneling, set this to only the IPs you would like to use the tunnel AND the ip of the server's WG ip, such as 10.13.13.1.` \ -p 51820:51820/udp `# wireguard port` \ -v ${BASEDIR:-/volume1/docker}/wireguard/config:/config `# Contains all relevant configuration files.` \ - -v ${BASEDIR:-/volume1/docker}/wireguard/lib/modules:/lib/modules `# Maps host's modules folder.` \ + -v /lib/modules:/lib/modules `# Maps host's modules folder.` \ --sysctl="net.ipv4.conf.all.src_valid_mark=1" \ --restart unless-stopped \ ghcr.io/linuxserver/wireguard diff --git a/lsio/wireguard/run-once.sh b/lsio/wireguard/run-once.sh index 86e1b70..18036e0 100644 --- a/lsio/wireguard/run-once.sh +++ b/lsio/wireguard/run-once.sh @@ -1,4 +1,3 @@ ln -s ../docker-env.cfg ./.env . ./.env mkdir -p ${BASEDIR:-/volume1/docker}/wireguard/config -mkdir -p ${BASEDIR:-/volume1/docker}/wireguard/lib/modules