diff --git a/media/docker-compose.yml b/media/docker-compose.yml index c5845b5..2863253 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -12,9 +12,7 @@ services: volumes: - ${VOLUMES_PATH}/jellyfin/config:/config - ${VOLUMES_PATH}/jellyfin/cache:/cache - - ${SERIEN_PATH}:/mnt/serien - - ${FILME_PATH}:/mnt/filme - - ${MUSIK_PATH}:/mnt/musik + - /mnt/wdhdd:/wdhdd devices: # VAAPI Devices - /dev/dri/renderD128:/dev/dri/renderD128 diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 17bc91c..631b6ea 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 100755 new mode 100644 index 076d191..df97df4 --- 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:1.8 influx -host influxdb +docker run --rm --link=monitoring_influxdb_1 -it --net monitoring_monitoring influxdb influx -host influxdb diff --git a/paperless/docker-compose.yaml b/paperless/docker-compose.yaml deleted file mode 100644 index 2da48dd..0000000 --- a/paperless/docker-compose.yaml +++ /dev/null @@ -1,72 +0,0 @@ -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/portainer/docker-compose.yaml b/portainer/docker-compose.yaml new file mode 100644 index 0000000..3a6ed3e --- /dev/null +++ b/portainer/docker-compose.yaml @@ -0,0 +1,24 @@ +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/pull-all.sh b/pull-all.sh index f9162cd..d0cd635 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 --ignore-buildable); + (cd "$dir" && echo "[$dir]" && docker compose pull); done diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml index 76383ff..067aadd 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}/smartHome/homeassistent:/config + - ${VOLUMES_PATH}/homeassistent:/config - /run/dbus:/run/dbus:ro environment: - TZ=Europe/Berlin diff --git a/start-all.sh b/start-all.sh index 5a906ea..768dc4f 100755 --- a/start-all.sh +++ b/start-all.sh @@ -11,7 +11,7 @@ up telegraf; up smartHome; up dashboard; up download; +up portainer; up torrent; up print; up media; -up paperless;