From 155a37e3c7cb3a40898fb0e32818315b61dae66b Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Tue, 5 Dec 2023 14:25:41 +0100 Subject: [PATCH 1/5] pyload updates --- download/docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/download/docker-compose.yaml b/download/docker-compose.yaml index 670a5e0..cd57060 100644 --- a/download/docker-compose.yaml +++ b/download/docker-compose.yaml @@ -1,16 +1,16 @@ services: app: - image: linuxserver/pyload + image: linuxserver/pyload-ng environment: - PUID=1000 - PGID=1000 - TZ=Europe/Berlin volumes: - - ${VOLUMES_PATH}/pyload:/config + - ${VOLUMES_PATH}/download/pyload:/config - ${DOWNLOAD_PATH}:/downloads - ports: - - 7227:7227 #optional Thrift Backend +# ports: + #- 7227:7227 #optional Thrift Backend networks: - web labels: From 6eb69e9914755ef4d6d22e38b27c8f17fef7f325 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Tue, 5 Dec 2023 14:26:05 +0100 Subject: [PATCH 2/5] remove graphics card from jellyfin --- media/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index c5845b5..8a699df 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -15,10 +15,10 @@ services: - ${SERIEN_PATH}:/mnt/serien - ${FILME_PATH}:/mnt/filme - ${MUSIK_PATH}:/mnt/musik - devices: - # VAAPI Devices - - /dev/dri/renderD128:/dev/dri/renderD128 - - /dev/dri/card0:/dev/dri/card0 +# devices: +# # VAAPI Devices +# - /dev/dri/renderD128:/dev/dri/renderD128 +# - /dev/dri/card0:/dev/dri/card0 labels: - "traefik.enable=true" - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.${DOMAIN}`)" From 03ea7a3d954615f4f76ce82d26225e6c7089ab6d Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 9 Feb 2024 13:48:18 +0100 Subject: [PATCH 3/5] move volumes to stack/service schema --- dashboard/docker-compose.yaml | 2 +- monitoring/docker-compose.yaml | 4 ++-- print/docker-compose.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboard/docker-compose.yaml b/dashboard/docker-compose.yaml index 58f202c..f13d8aa 100644 --- a/dashboard/docker-compose.yaml +++ b/dashboard/docker-compose.yaml @@ -7,7 +7,7 @@ services: - PGID=1000 - TZ=Europe/Berlin volumes: - - ${VOLUMES_PATH}/heimdall:/config + - ${VOLUMES_PATH}/dashboard/heimdall:/config expose: - "80" networks: diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 17bc91c..0bb4db6 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -38,7 +38,7 @@ services: grafanadb: image: postgres:${POSTGRES_VERSION} volumes: - - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data + - ${VOLUMES_PATH}/monitoring/grafanadb:/var/lib/postgresql/data networks: - monitoring restart: unless-stopped @@ -59,7 +59,7 @@ services: environment: - INFLUXDB_MONITOR_STORE_ENABLED=false volumes: - - ${VOLUMES_PATH}/influxdb/:/var/lib/influxdb + - ${VOLUMES_PATH}/monitoring/influxdb/:/var/lib/influxdb - ${PWD}/influxdb.conf:/etc/influxdb/influxdb.conf:ro labels: - "traefik.enable=true" diff --git a/print/docker-compose.yaml b/print/docker-compose.yaml index 6a3fae4..14ca900 100644 --- a/print/docker-compose.yaml +++ b/print/docker-compose.yaml @@ -5,7 +5,7 @@ services: image: cupsd volumes: - /var/run/dbus:/var/run/dbus - - ${VOLUMES_PATH}/cups:/etc/cups + - ${VOLUMES_PATH}/print/cups:/etc/cups devices: - /dev/usb/lp0 privileged: true From d469ef3f68ac07632b194b1b4fad67505c563ddb Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 9 Feb 2024 13:51:46 +0100 Subject: [PATCH 4/5] cleanup and improvements --- paperless/docker-compose.yaml | 5 +++-- proxy/docker-compose.yaml | 22 +++++++++++----------- pull-min.sh | 1 - start-min.sh | 1 - 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/paperless/docker-compose.yaml b/paperless/docker-compose.yaml index 2da48dd..9e77420 100644 --- a/paperless/docker-compose.yaml +++ b/paperless/docker-compose.yaml @@ -24,7 +24,7 @@ services: labels: - "docker.group=paperless" - webserver: + paperless-ngx: image: ghcr.io/paperless-ngx/paperless-ngx:${PAPERLESS_NGX_VERSION} restart: unless-stopped networks: @@ -46,7 +46,8 @@ services: - ${CONSUME_PATH}:/usr/src/paperless/consume environment: - PAPERLESS_REDIS=redis://broker:6379 - - PAPERLESS_DBHOST=${POSTGRES_DB} + - PAPERLESS_DBHOST=db + - PAPERLESS_DBNAME=${POSTGRES_DB} - PAPERLESS_DBUSER=${POSTGRES_USER} - PAPERLESS_DBPASS=${POSTGRES_PASSWORD} - PAPERLESS_OCR_LANGUAGES=deu eng diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 37522cb..9600d1d 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -38,17 +38,17 @@ services: privileged: true - whoami: - image: containous/whoami - networks: - - web - labels: - - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`whoami.${HOSTNAME}`)" - - "traefik.http.routers.whoami.entrypoints=web" - - "traefik.http.services.whoami.loadbalancer.server.port=80" - - "docker.group=proxy" - restart: unless-stopped +# whoami: +# image: containous/whoami +# networks: +# - web +# labels: +# - "traefik.enable=true" +# - "traefik.http.routers.whoami.rule=Host(`whoami.${HOSTNAME}`)" +# - "traefik.http.routers.whoami.entrypoints=web" +# - "traefik.http.services.whoami.loadbalancer.server.port=80" +# - "docker.group=proxy" +# restart: unless-stopped networks: diff --git a/pull-min.sh b/pull-min.sh index c2d2df6..b457b76 100755 --- a/pull-min.sh +++ b/pull-min.sh @@ -6,4 +6,3 @@ function pull { pull proxy; pull telegraf; -pull portainer; diff --git a/start-min.sh b/start-min.sh index 5eb72c9..92d5258 100755 --- a/start-min.sh +++ b/start-min.sh @@ -7,5 +7,4 @@ function up { up proxy; up telegraf; -up portainer; From c70b5f90d11528ae04e7e53ca88645970cebda08 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 9 Feb 2024 13:52:01 +0100 Subject: [PATCH 5/5] fix print --- print/Dockerfile | 6 ++++++ print/docker-compose.yaml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/print/Dockerfile b/print/Dockerfile index b7f7304..26ab63f 100644 --- a/print/Dockerfile +++ b/print/Dockerfile @@ -1,5 +1,9 @@ FROM debian:bookworm + +ENV DEBIAN_FRONTEND noninteractive +ENV TZ "Europe/Berlin" + # Install Packages (basic tools, cups, basic drivers, HP drivers) RUN apt-get update \ && apt-get install -y \ @@ -21,6 +25,8 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +EXPOSE 631 + # Add user and disable sudo password checking RUN useradd \ --groups=sudo,lp,lpadmin \ diff --git a/print/docker-compose.yaml b/print/docker-compose.yaml index 14ca900..14273ed 100644 --- a/print/docker-compose.yaml +++ b/print/docker-compose.yaml @@ -6,6 +6,8 @@ services: volumes: - /var/run/dbus:/var/run/dbus - ${VOLUMES_PATH}/print/cups:/etc/cups + - ${VOLUMES_PATH}/print/spool/cups:/var/spool/cups + - ${VOLUMES_PATH}/print/spool/cups-pdf:/var/spool/cups-pdf devices: - /dev/usb/lp0 privileged: true