Fixed conflicts

docker_config/5etools/5etools-update.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 # based on: https://wiki.5e.tools/index.php/5eTools_Install_Guide
-<<<<<<< HEAD
 source .env
-=======
-
->>>>>>> 79fb142ddb9c7422cbecfec24bd5abeaa6e7b5f2
 cd ${DOCKER_DATA}/htdocs
 
 FN=`curl -s -I https://get.5e.tools/release/|grep filename|cut -d"=" -f2 | awk '{print $1}'`

docker_config/5etools/docker-compose.yml

@@ -8,11 +8,15 @@ services:
     networks:
       - web
     volumes:
+<<<<<<< HEAD
 <<<<<<< HEAD
       - "${DOCKER_DATA}/htdocs:/usr/local/apache2/htdocs"
 =======
       - ${DOCKER_DATA}/htdocs:/usr/local/apache2/htdocs
 >>>>>>> 79fb142ddb9c7422cbecfec24bd5abeaa6e7b5f2
+=======
+      - "${DOCKER_DATA}/htdocs:/usr/local/apache2/htdocs"
+>>>>>>> 6906ce88723c1aa9377e354b69bdc3c538cd5494
     labels:
       - traefik.http.routers.5etools.rule=Host(`5e.jafner.net`)
       - traefik.http.routers.5etools.tls=true

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:

docker_config/calibre-web/.env

@@ -0,0 +1 @@
+LIBRARY_DIR=/mnt/nas/Ebooks/Calibre

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

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:

docker_config/grafana-stack/.env

@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/docker_data/grafana-stack

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