From 5c4a540e873e9ea2cdce26a8107b0ebabfd87ca2 Mon Sep 17 00:00:00 2001 From: Jafner <40403594+Jafner@users.noreply.github.com> Date: Tue, 2 Mar 2021 10:10:01 -0800 Subject: [PATCH] Misc fixes. Fixed failed volume mount for 5etools Removed superfluous .env files Updated bookstack to docker-compose v3 Updated calibre-web to docker-compose v3 and integrated into new schema Removed superfluous traefik labels --- docker_config/5etools/5etools-update.sh | 2 +- docker_config/5etools/docker-compose.yml | 2 +- docker_config/bookstack/.env | 0 docker_config/bookstack/docker-compose.yml | 28 ++++++++----------- docker_config/calibre-web/.env | 1 + docker_config/calibre-web/docker-compose.yml | 5 ++-- docker_config/element/.env | 0 docker_config/firefox-sync/docker-compose.yml | 3 -- docker_config/grafana-stack/.env | 1 + .../grafana-stack/docker-compose.yml | 2 +- 10 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 docker_config/bookstack/.env delete mode 100644 docker_config/element/.env diff --git a/docker_config/5etools/5etools-update.sh b/docker_config/5etools/5etools-update.sh index 1970ce28..c6ca8db6 100755 --- a/docker_config/5etools/5etools-update.sh +++ b/docker_config/5etools/5etools-update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # based on: https://wiki.5e.tools/index.php/5eTools_Install_Guide - +source .env cd ${DOCKER_DATA}/htdocs FN=`curl -s -I https://get.5e.tools/release/|grep filename|cut -d"=" -f2 | awk '{print $1}'` diff --git a/docker_config/5etools/docker-compose.yml b/docker_config/5etools/docker-compose.yml index ae78a84a..361b019d 100644 --- a/docker_config/5etools/docker-compose.yml +++ b/docker_config/5etools/docker-compose.yml @@ -6,7 +6,7 @@ services: networks: - web volumes: - - ${DOCKER_DATA}/htdocs:/usr/local/apache2/htdocs + - "${DOCKER_DATA}/htdocs:/usr/local/apache2/htdocs" labels: - traefik.http.routers.5etools.rule=Host(`5e.jafner.net`) - traefik.http.routers.5etools.tls=true diff --git a/docker_config/bookstack/.env b/docker_config/bookstack/.env deleted file mode 100644 index e69de29b..00000000 diff --git a/docker_config/bookstack/docker-compose.yml b/docker_config/bookstack/docker-compose.yml index 920d5cf3..cd119aa0 100644 --- a/docker_config/bookstack/docker-compose.yml +++ b/docker_config/bookstack/docker-compose.yml @@ -1,5 +1,4 @@ ---- -version: "2" +version: '3' services: bookstack: image: linuxserver/bookstack @@ -13,18 +12,17 @@ services: - DB_DATABASE=bookstackapp - APP_URL=https://docs.jafner.net volumes: - - /home/joey/docker/bookstack/config:/config + - ./config:/config restart: unless-stopped depends_on: - bookstack_db networks: - - web - - bookstack + - web + - bookstack labels: - - traefik.http.routers.bookstack.rule=Host(`docs.jafner.net`) - - traefik.http.routers.bookstack.tls=true - - traefik.http.routers.bookstack.tls.certresolver=lets-encrypt - - traefik.port=80 + - traefik.http.routers.bookstack.rule=Host(`docs.jafner.net`) + - traefik.http.routers.bookstack.tls=true + - traefik.http.routers.bookstack.tls.certresolver=lets-encrypt bookstack_db: image: linuxserver/mariadb @@ -38,14 +36,12 @@ services: - MYSQL_USER=bookstack - MYSQL_PASSWORD=yourdbpass volumes: - - /home/joey/docker/bookstack/config_db:/config + - ./config_db:/config restart: unless-stopped networks: - - bookstack - labels: - - traefik.enable=false + - bookstack networks: - web: - external: true - bookstack: + web: + external: true + bookstack: diff --git a/docker_config/calibre-web/.env b/docker_config/calibre-web/.env index e69de29b..27e0058e 100644 --- a/docker_config/calibre-web/.env +++ b/docker_config/calibre-web/.env @@ -0,0 +1 @@ +LIBRARY_DIR=/mnt/nas/Ebooks/Calibre \ No newline at end of file diff --git a/docker_config/calibre-web/docker-compose.yml b/docker_config/calibre-web/docker-compose.yml index 63e358c5..2e641eaa 100644 --- a/docker_config/calibre-web/docker-compose.yml +++ b/docker_config/calibre-web/docker-compose.yml @@ -1,5 +1,4 @@ ---- -version: "2" +version: '3' services: calibre-web: image: linuxserver/calibre-web @@ -10,7 +9,7 @@ services: - TZ=America/Los_Angeles volumes: - calibre-web_data:/config - - /mnt/nas/Ebooks/Calibre:/books + - ${LIBRARY_DIR}:/books labels: - traefik.http.routers.calibre.rule=Host(`calibre.jafner.net`) - traefik.http.routers.calibre.tls=true diff --git a/docker_config/element/.env b/docker_config/element/.env deleted file mode 100644 index e69de29b..00000000 diff --git a/docker_config/firefox-sync/docker-compose.yml b/docker_config/firefox-sync/docker-compose.yml index b23f73f4..4ad5d01d 100644 --- a/docker_config/firefox-sync/docker-compose.yml +++ b/docker_config/firefox-sync/docker-compose.yml @@ -6,13 +6,10 @@ services: container_name: firefox-sync volumes: - firefox_sync_data:/data - env_file: - - .env labels: - traefik.http.routers.firefox-sync.rule=Host(`firefox-sync.jafner.net`) - traefik.http.routers.firefox-sync.tls=true - traefik.http.routers.firefox-sync.tls.certresolver=letsencrypt - - traefik.port=5000 restart: unless-stopped volumes: diff --git a/docker_config/grafana-stack/.env b/docker_config/grafana-stack/.env index e69de29b..b3a1b814 100644 --- a/docker_config/grafana-stack/.env +++ b/docker_config/grafana-stack/.env @@ -0,0 +1 @@ +DOCKER_DATA=/home/joey/docker_data/grafana-stack \ No newline at end of file diff --git a/docker_config/grafana-stack/docker-compose.yml b/docker_config/grafana-stack/docker-compose.yml index 7aea6dbe..29e754f4 100644 --- a/docker_config/grafana-stack/docker-compose.yml +++ b/docker_config/grafana-stack/docker-compose.yml @@ -11,7 +11,7 @@ services: - 8089:8089/udp volumes: - ./influxdb.conf:/etc/influxdb/influxdb.conf:ro - - ./influxdb/db:/var/lib/influxdb + - ${DOCKER_DATA}/influxdb:/var/lib/influxdb environment: - TZ=America/Los_Angeles - INFLUXDB_HTTP_ENABLED=true