From 9b1800b4a8efc2722ea265bb19fd02a3d8fdffa7 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 29 Nov 2023 11:22:19 +0100 Subject: [PATCH 1/5] Neue Pfade (wegen Nas) --- media/docker-compose.yml | 4 +++- smartHome/docker-compose.yaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 2863253..c5845b5 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -12,7 +12,9 @@ services: volumes: - ${VOLUMES_PATH}/jellyfin/config:/config - ${VOLUMES_PATH}/jellyfin/cache:/cache - - /mnt/wdhdd:/wdhdd + - ${SERIEN_PATH}:/mnt/serien + - ${FILME_PATH}:/mnt/filme + - ${MUSIK_PATH}:/mnt/musik devices: # VAAPI Devices - /dev/dri/renderD128:/dev/dri/renderD128 diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml index 067aadd..76383ff 100644 --- a/smartHome/docker-compose.yaml +++ b/smartHome/docker-compose.yaml @@ -3,7 +3,7 @@ services: homeassistant: image: ghcr.io/home-assistant/home-assistant:stable volumes: - - ${VOLUMES_PATH}/homeassistent:/config + - ${VOLUMES_PATH}/smartHome/homeassistent:/config - /run/dbus:/run/dbus:ro environment: - TZ=Europe/Berlin From de784cd5bfff898306bf419af668690a5c7422fa Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 29 Nov 2023 11:23:07 +0100 Subject: [PATCH 2/5] Influxdb 1.8 --- monitoring/docker-compose.yaml | 2 +- monitoring/start-influxdb-shell.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 monitoring/start-influxdb-shell.sh diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 631b6ea..17bc91c 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -74,7 +74,7 @@ services: image: louislam/uptime-kuma:1 volumes: - ${VOLUMES_PATH}/monitoring/uptime-kuma-data:/app/data - networks: + networks: - web - dockersocket restart: unless-stopped diff --git a/monitoring/start-influxdb-shell.sh b/monitoring/start-influxdb-shell.sh old mode 100644 new mode 100755 index df97df4..076d191 --- a/monitoring/start-influxdb-shell.sh +++ b/monitoring/start-influxdb-shell.sh @@ -1 +1 @@ -docker run --rm --link=monitoring_influxdb_1 -it --net monitoring_monitoring influxdb influx -host influxdb +docker run --rm --link=monitoring_influxdb_1 -it --net monitoring_monitoring influxdb:1.8 influx -host influxdb From b2ef4c623d1864a5adc19c0bed3928454459e518 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 29 Nov 2023 11:32:07 +0100 Subject: [PATCH 3/5] remove Portainer --- portainer/docker-compose.yaml | 24 ------------------------ start-all.sh | 1 - 2 files changed, 25 deletions(-) delete mode 100644 portainer/docker-compose.yaml diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml deleted file mode 100644 index 3a6ed3e..0000000 --- a/portainer/docker-compose.yaml +++ /dev/null @@ -1,24 +0,0 @@ -services: - - app: - image: portainer/portainer-ce - volumes: - - ${VOLUMES_PATH}/portainer:/data - - /var/run/docker.sock:/var/run/docker.sock:z - - /var/lib/docker/volumes:/var/lib/docker/volumes - ports: - - "9000:9000" # to get portainer without proxy too - networks: - - web - labels: - - "traefik.enable=true" - - "traefik.http.routers.portainer.rule=Host(`portainer.${HOSTNAME}`)" - - "traefik.http.routers.portainer.entrypoints=web" - - "traefik.http.services.portainer.loadbalancer.server.port=9000" - - "docker.group=selfhost" - - "docker.group=portainer" - restart: unless-stopped - -networks: - web: - external: true diff --git a/start-all.sh b/start-all.sh index 768dc4f..358a77b 100755 --- a/start-all.sh +++ b/start-all.sh @@ -11,7 +11,6 @@ up telegraf; up smartHome; up dashboard; up download; -up portainer; up torrent; up print; up media; From 86fbc2c809b5cd47d498250312db05bd73ea2813 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 29 Nov 2023 11:32:39 +0100 Subject: [PATCH 4/5] add --ignore-buildable to pull --- pull-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull-all.sh b/pull-all.sh index d0cd635..f9162cd 100755 --- a/pull-all.sh +++ b/pull-all.sh @@ -5,5 +5,5 @@ for dir in ./*/ ; do done for dir in ./*/ ; do - (cd "$dir" && echo "[$dir]" && docker compose pull); + (cd "$dir" && echo "[$dir]" && docker compose pull --ignore-buildable); done From 2dff5feed5f96fc6d42e36a8cdfb166040f212d4 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 29 Nov 2023 11:34:03 +0100 Subject: [PATCH 5/5] Add Paperless-ngx --- paperless/docker-compose.yaml | 72 +++++++++++++++++++++++++++++++++++ start-all.sh | 1 + 2 files changed, 73 insertions(+) create mode 100644 paperless/docker-compose.yaml diff --git a/paperless/docker-compose.yaml b/paperless/docker-compose.yaml new file mode 100644 index 0000000..2da48dd --- /dev/null +++ b/paperless/docker-compose.yaml @@ -0,0 +1,72 @@ +services: + + broker: + image: redis:${REDIS_VERSION} + restart: unless-stopped + networks: + - paperless + volumes: + - ${VOLUMES_PATH}/paperless/redis:/data + labels: + - "docker.group=paperless" + + db: + image: postgres:${POSTGRES_VERSION} + restart: unless-stopped + networks: + - paperless + volumes: + - ${VOLUMES_PATH}/paperless/postgres:/var/lib/postgresql/data + environment: + - POSTGRES_DB=${POSTGRES_DB} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + labels: + - "docker.group=paperless" + + webserver: + image: ghcr.io/paperless-ngx/paperless-ngx:${PAPERLESS_NGX_VERSION} + restart: unless-stopped + networks: + - paperless + - web + depends_on: + - db + - broker + healthcheck: + test: ["CMD", "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - ${VOLUMES_PATH}/paperless/data:/usr/src/paperless/data + - ${VOLUMES_PATH}/paperless/scripts:/usr/src/paperless/scripts + - ${MEDIA_PATH}:/usr/src/paperless/media + - ${EXPORT_PATH}:/usr/src/paperless/export + - ${CONSUME_PATH}:/usr/src/paperless/consume + environment: + - PAPERLESS_REDIS=redis://broker:6379 + - PAPERLESS_DBHOST=${POSTGRES_DB} + - PAPERLESS_DBUSER=${POSTGRES_USER} + - PAPERLESS_DBPASS=${POSTGRES_PASSWORD} + - PAPERLESS_OCR_LANGUAGES=deu eng + - PAPERLESS_URL=http://paperless.${DOMAIN} + - PAPERLESS_OCR_LANGUAGE=deu + - PAPERLESS_FILENAME_FORMAT={correspondent}/{created} {title} + - PAPERLESS_CONSUMER_POLLING=60 + - USERMAP_UID=1000 + - USERMAP_GID=1000 + - PAPERLESS_PRE_CONSUME_SCRIPT=/usr/src/paperless/scripts/removePdfPassword.py + labels: + - "traefik.enable=true" + - "traefik.http.routers.paperless.rule=Host(`paperless.${DOMAIN}`)" + - "traefik.http.routers.paperless.entrypoints=web" + - "traefik.http.services.paperless.loadbalancer.server.port=8000" + - "traefik.docker.network=web" + - "docker.group=paperless" + + +networks: + paperless: + web: + external: true diff --git a/start-all.sh b/start-all.sh index 358a77b..5a906ea 100755 --- a/start-all.sh +++ b/start-all.sh @@ -14,3 +14,4 @@ up download; up torrent; up print; up media; +up paperless;