From f9008cf4e47029398e6cc2189796054e40371025 Mon Sep 17 00:00:00 2001 From: Cristian Miranda Date: Wed, 28 Oct 2020 12:05:06 -0300 Subject: [PATCH] books: Added calibre-web and extracted calibre to its own compose file --- README.md | 4 ++++ docker-compose.books.yml | 52 ++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 26 -------------------- 3 files changed, 56 insertions(+), 26 deletions(-) create mode 100644 docker-compose.books.yml diff --git a/README.md b/README.md index 744114b..cf30449 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ * [SABnzbd](https://sabnzbd.org/) * [Deluge](https://deluge-torrent.org/) (built-in dark mode) * [Calibre](https://calibre-ebook.com/) +* [Calibre Web](https://github.com/janeczku/calibre-web) * [Portainer 2.0](https://www.portainer.io/) * [Watchtower](https://github.com/containrrr/watchtower) * [Organizr](https://github.com/causefx/Organizr) @@ -51,6 +52,9 @@ docker-compose -f docker-compose.yml -f docker-compose.torrents-on-vpn.yml -f do # Main stack + VPN Protected Torrenting + Plex HW Transcoding + Custom domain & SSL certificates docker-compose -f docker-compose.yml -f docker-compose.torrents-on-vpn.yml -f docker-compose.plex-hw.yml -f docker-compose.traefik.yml up -d + +# Main stack + VPN Protected Torrenting + Plex HW Transcoding + Custom domain & SSL certificates + Calibre +docker-compose -f docker-compose.yml -f docker-compose.torrents-on-vpn.yml -f docker-compose.plex-hw.yml -f docker-compose.traefik.yml -f docker-compose.books.yml up -d ``` ## Stopping diff --git a/docker-compose.books.yml b/docker-compose.books.yml new file mode 100644 index 0000000..40c5dc6 --- /dev/null +++ b/docker-compose.books.yml @@ -0,0 +1,52 @@ +version: "3.3" + +services: + calibre: + image: linuxserver/calibre + container_name: calibre + networks: + default: + ipv4_address: 172.20.2.1 + ports: + - 9080:8080 + - 9081:8081 + labels: + - com.centurylinklabs.watchtower.enable=true + - traefik.enable=true + - traefik.http.routers.calibre.rule=Host(`calibre.${DOMAIN}`) + - traefik.http.routers.calibre.entrypoints=websecured + - traefik.http.routers.calibre.tls.certresolver=myresolver + - traefik.http.services.calibre.loadbalancer.server.port=8080 + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TIMEZONE} + - GUAC_USER=${CALIBRE_USERNAME} + - GUAC_PASS=${CALIBRE_PASSWORD} + volumes: + - ${CONTAINERS}/calibre:/config + restart: unless-stopped + + calibre-web: + image: linuxserver/calibre-web + container_name: calibre-web + networks: + default: + ipv4_address: 172.20.2.6 + ports: + - 8083:8083 + labels: + - com.centurylinklabs.watchtower.enable=true + - traefik.enable=true + - traefik.http.routers.calibreweb.rule=Host(`calibre-web.${DOMAIN}`) + - traefik.http.routers.calibreweb.entrypoints=websecured + - traefik.http.routers.calibreweb.tls.certresolver=myresolver + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/London + - DOCKER_MODS=linuxserver/calibre-web:calibre + volumes: + - ${CONTAINERS}/calibre-web:/config + - ${CONTAINERS}/calibre:/books + restart: unless-stopped diff --git a/docker-compose.yml b/docker-compose.yml index c5017c2..e09ffb2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -197,32 +197,6 @@ services: - ${DOWNLOADS}/usenet:/downloads restart: unless-stopped - calibre: - image: linuxserver/calibre - container_name: calibre - networks: - default: - ipv4_address: 172.20.2.1 - ports: - - 9080:8080 - - 9081:8081 - labels: - - com.centurylinklabs.watchtower.enable=true - - traefik.enable=true - - traefik.http.routers.calibre.rule=Host(`calibre.${DOMAIN}`) - - traefik.http.routers.calibre.entrypoints=websecured - - traefik.http.routers.calibre.tls.certresolver=myresolver - - traefik.http.services.calibre.loadbalancer.server.port=8080 - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TIMEZONE} - - GUAC_USER=${CALIBRE_USERNAME} - - GUAC_PASS=${CALIBRE_PASSWORD} - volumes: - - ${CONTAINERS}/calibre:/config - restart: unless-stopped - portainer: image: portainer/portainer-ce container_name: portainer