diff --git a/docker-compose.yml b/docker-compose.yml index d0cd604..3615f4d 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -248,32 +248,6 @@ services: - 5734:80 restart: unless-stopped - ## Joplin (notes) - joplin: - container_name: joplin - image: joplin/server:latest - ports: - - 22300:22300 - env_file: - - ${ENV_DIR}/joplin.env - depends_on: - - joplin-db - dns: - - ${DNS_IP} - restart: unless-stopped - joplin-db: - container_name: joplin-db - image: postgres:15 - volumes: - - ${DOCKER_DIR}/joplin:/var/lib/postgresql/data - ports: - - 5432:5432 - environment: - - POSTGRES_PASSWORD=d8t3nmcj3 - - POSTGRES_USER=april - - POSTGRES_DB=joplin - restart: unless-stopped - ## Kiwix (offline wiki) kiwix-serve: container_name: kiwix-serve @@ -333,9 +307,9 @@ services: container_name: multi-scrobbler image: foxxmd/multi-scrobbler env_file: - - ${ENV_DIR}/multi-scrobbler.env + - ${ENV_DIR}/scrobbler.env volumes: - - ${DOCKER_DIR}/multi-scrobbler:/config + - ${DOCKER_DIR}/scrobbler:/config ports: - 9078:9078 restart: unless-stopped @@ -571,6 +545,28 @@ services: #---------------- MONITORING ----------------# + + ## Beszel (system monitoring) + beszel: + container_name: beszel + image: henrygd/beszel + ports: + - 2493:8090 + volumes: + - ${DOCKER_DIR}/beszel/data:/beszel_data + - ${DOCKER_DIR}/beszel/socket:/beszel_socket + restart: unless-stopped + beszel-agent: + container_name: beszel-agent + image: henrygd/beszel-agent:latest + env_file: + - ${ENV_DIR}/beszel.env + volumes: + - ${DOCKER_DIR}/beszel/socket:/beszel_socket + - /var/run/docker.sock:/var/run/docker.sock:ro + network_mode: host + restart: unless-stopped + ## Dozzle (docker logs) dozzle: container_name: dozzle @@ -581,23 +577,6 @@ services: - 9999:8080 restart: unless-stopped - ## Glances (system monitor) - glances: - container_name: glances - image: nicolargo/glances:latest - pid: host - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /:/glances/root:ro - environment: - - "GLANCES_OPT=-w" - ports: - - 61208:61208 - secrets: - - source: glances_password - target: /root/.config/glances/glances.pwd - restart: unless-stopped - ## Scrutiny (disk health monitoring) scrutiny: container_name: scrutiny @@ -626,6 +605,8 @@ services: - ${DOCKER_DIR}/myspeed:/myspeed/data ports: - 5216:5216 + dns: + - ${DNS_IP} restart: unless-stopped @@ -702,45 +683,6 @@ services: - 6767:6767 restart: unless-stopped - ## Calibre Downloader (ebook downloading) - calibre-dl: - container_name: calibre-dl - image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest - environment: - - FLASK_PORT=8084 - - FLASK_DEBUG=false - - CLOUDFLARE_PROXY_URL=http://cf-bypass:8000 - - INGEST_DIR=/cwa-book-ingest - - BOOK_LANGUAGE=en - ports: - - 8085:8084 - volumes: - - ${DOCKER_DIR}/calibre/ingest:/cwa-book-ingest - dns: - - ${DNS_IP} - restart: unless-stopped - ## Cloudflare challenge bypass (for accessing Anna's Archive) - cf-bypass: - container_name: cf-bypass - image: ghcr.io/sarperavci/cloudflarebypassforscraping:latest - dns: - - ${DNS_IP} - restart: unless-stopped - - ## openbooks (IRC-based ebook downloading) - openbooks: - container_name: openbooks - image: evanbuss/openbooks:latest - command: --persist --name azpsen - ports: - - 8087:80 - volumes: - # This works because calibre-web-automated fails to import .tmp files - - ${DOCKER_DIR}/calibre/ingest/:/books - dns: - - ${DNS_IP} - restart: unless-stopped - ## Prowlarr (torrent indexer management) prowlarr: container_name: prowlarr @@ -806,10 +748,6 @@ services: #---------------- DOCKER ----------------# -secrets: - glances_password: - file: ${DOCKER_DIR}/secrets/glances_password - volumes: hoarder: joplindb: diff --git a/readme.md b/readme.md index 0ba6c3f..1942974 100644 --- a/readme.md +++ b/readme.md @@ -38,7 +38,6 @@ These are all the services hosted, what they are for, and any clients I use with - [iOS Client](https://apps.apple.com/us/app/grocy-mobile/id1567803209) - [Wallabag](https://wallabag.org/) - Bookmark tool for links, pictures, notes, etc. - [IT Tools](https://github.com/CorentinTh/it-tools) - Collection of random useful development/IT utilities -- [Joplin](https://joplinapp.org/) - Notes (Obsidian alternative) - [Kiwix](https://kiwix.org/en/) - Offline wiki hosting - I have Wikipedia, the Arch Linux wiki, and several others downloaded - [LinkStack](https://linkstack.org/) - Self-hosted LinkTree alternative ([azpsen.com](https://azpsen.com)) - more for content creators, definitely overkill for what I need. I'll probably replace it with a simple static site at some point - [LubeLogger](https://lubelogger.com/) - Car mileage and service tracker @@ -78,9 +77,7 @@ In `docker-compose.yml`, services that I access through tailscale need the `dns: ### Downloading - [Bazarr](https://www.bazarr.media/) - Automated subtitle fetching (I also use the OpenSubtitles plugin within Jellyfin when needed, but this works hands-off most of the time) -- [Calibre Web Book Downloader](https://github.com/calibrain/calibre-web-automated-book-downloader) - Automated ebook search and downloading -- [openbooks](https://github.com/evan-buss/openbooks) - Automated IRC-based ebook search and downloading -- [Prowlarr](https://prowlarr.com/) - Torrent indexer that interfaces with the other *arrs +- [Prowlarr](https://prowlarr.com/) - Torrent indexer that interfaces with the other \*arrs - [qBittorrent](https://www.qbittorrent.org/) - The only torrent client I'll ever use - [Radarr](https://radarr.video/) - Automated movie fetching - [Sonarr](https://sonarr.tv/) - Automated TV show fetching @@ -298,7 +295,7 @@ POSTGRES_DB=miniflux [Docs](https://foxxmd.github.io/multi-scrobbler/docs/configuration/) ```env -# multi-scrobbler.env +# scrobbler.env TZ=America/Chicago PUID=1000