diff --git a/dashboard/docker-compose.yaml b/dashboard/docker-compose.yaml index f13d8aa..58f202c 100644 --- a/dashboard/docker-compose.yaml +++ b/dashboard/docker-compose.yaml @@ -7,7 +7,7 @@ services: - PGID=1000 - TZ=Europe/Berlin volumes: - - ${VOLUMES_PATH}/dashboard/heimdall:/config + - ${VOLUMES_PATH}/heimdall:/config expose: - "80" networks: diff --git a/download/docker-compose.yaml b/download/docker-compose.yaml index cd57060..670a5e0 100644 --- a/download/docker-compose.yaml +++ b/download/docker-compose.yaml @@ -1,16 +1,16 @@ services: app: - image: linuxserver/pyload-ng + image: linuxserver/pyload environment: - PUID=1000 - PGID=1000 - TZ=Europe/Berlin volumes: - - ${VOLUMES_PATH}/download/pyload:/config + - ${VOLUMES_PATH}/pyload:/config - ${DOWNLOAD_PATH}:/downloads -# ports: - #- 7227:7227 #optional Thrift Backend + ports: + - 7227:7227 #optional Thrift Backend networks: - web labels: diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 8a699df..c5845b5 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}`)" diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 0bb4db6..17bc91c 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -38,7 +38,7 @@ services: grafanadb: image: postgres:${POSTGRES_VERSION} volumes: - - ${VOLUMES_PATH}/monitoring/grafanadb:/var/lib/postgresql/data + - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data networks: - monitoring restart: unless-stopped @@ -59,7 +59,7 @@ services: environment: - INFLUXDB_MONITOR_STORE_ENABLED=false volumes: - - ${VOLUMES_PATH}/monitoring/influxdb/:/var/lib/influxdb + - ${VOLUMES_PATH}/influxdb/:/var/lib/influxdb - ${PWD}/influxdb.conf:/etc/influxdb/influxdb.conf:ro labels: - "traefik.enable=true" diff --git a/paperless/docker-compose.yaml b/paperless/docker-compose.yaml index 9e77420..2da48dd 100644 --- a/paperless/docker-compose.yaml +++ b/paperless/docker-compose.yaml @@ -24,7 +24,7 @@ services: labels: - "docker.group=paperless" - paperless-ngx: + webserver: image: ghcr.io/paperless-ngx/paperless-ngx:${PAPERLESS_NGX_VERSION} restart: unless-stopped networks: @@ -46,8 +46,7 @@ services: - ${CONSUME_PATH}:/usr/src/paperless/consume environment: - PAPERLESS_REDIS=redis://broker:6379 - - PAPERLESS_DBHOST=db - - PAPERLESS_DBNAME=${POSTGRES_DB} + - PAPERLESS_DBHOST=${POSTGRES_DB} - PAPERLESS_DBUSER=${POSTGRES_USER} - PAPERLESS_DBPASS=${POSTGRES_PASSWORD} - PAPERLESS_OCR_LANGUAGES=deu eng diff --git a/print/Dockerfile b/print/Dockerfile index 26ab63f..b7f7304 100644 --- a/print/Dockerfile +++ b/print/Dockerfile @@ -1,9 +1,5 @@ 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 \ @@ -25,8 +21,6 @@ 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 14273ed..6a3fae4 100644 --- a/print/docker-compose.yaml +++ b/print/docker-compose.yaml @@ -5,9 +5,7 @@ services: image: cupsd 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 + - ${VOLUMES_PATH}/cups:/etc/cups devices: - /dev/usb/lp0 privileged: true diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 9600d1d..37522cb 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 b457b76..c2d2df6 100755 --- a/pull-min.sh +++ b/pull-min.sh @@ -6,3 +6,4 @@ function pull { pull proxy; pull telegraf; +pull portainer; diff --git a/start-min.sh b/start-min.sh index 92d5258..5eb72c9 100755 --- a/start-min.sh +++ b/start-min.sh @@ -7,4 +7,5 @@ function up { up proxy; up telegraf; +up portainer;