Separate calibre and calibre-web
This commit is contained in:
parent
cdf80395c6
commit
3a39161d6c
|
@ -39,7 +39,8 @@ Version 2 is released, please make sure you read [this V2 Migration Guide](doc/U
|
||||||
| Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor |
|
| Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor |
|
||||||
| Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor |
|
| Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor |
|
||||||
| Readarr | readarr.yourdomain.com | [linuxserver/readarr](https://hub.docker.com/r/linuxserver/readarr) | *nightly* | Ebook and comic monitor |
|
| Readarr | readarr.yourdomain.com | [linuxserver/readarr](https://hub.docker.com/r/linuxserver/readarr) | *nightly* | Ebook and comic monitor |
|
||||||
| Calibre + Calibre-web | calibre.yourdomain.com | [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web) | *latest* | Book management + UI |
|
| Calibre | calibre-admin.yourdomain.com | [linuxserver/calibre](https://hub.docker.com/r/linuxserver/calibre) | *latest* | eBook management |
|
||||||
|
| Calibre-web | calibre.yourdomain.com | [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web) | *latest* | Book management UI |
|
||||||
| Komga | komga.yourdomain.com | [gotson/komga](https://hub.docker.com/r/gotson/komga) | *latest* | Comic Book Manager |
|
| Komga | komga.yourdomain.com | [gotson/komga](https://hub.docker.com/r/gotson/komga) | *latest* | Comic Book Manager |
|
||||||
| Kavita | Kavita.yourdomain.com | [gotson/komga](https://hub.docker.com/r/gotson/komga) | *latest* | Comic Book Manager |
|
| Kavita | Kavita.yourdomain.com | [gotson/komga](https://hub.docker.com/r/gotson/komga) | *latest* | Comic Book Manager |
|
||||||
| Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests |
|
| Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests |
|
||||||
|
|
|
@ -120,9 +120,14 @@ services:
|
||||||
- host: calibre-admin.${TRAEFIK_DOMAIN}
|
- host: calibre-admin.${TRAEFIK_DOMAIN}
|
||||||
httpAuth: true
|
httpAuth: true
|
||||||
internalPort: 8080
|
internalPort: 8080
|
||||||
|
- name: calibre-web
|
||||||
|
enabled: false
|
||||||
|
vpn: false
|
||||||
|
traefik:
|
||||||
|
enabled: true
|
||||||
|
rules:
|
||||||
- host: calibre.${TRAEFIK_DOMAIN}
|
- host: calibre.${TRAEFIK_DOMAIN}
|
||||||
httpAuth: true
|
httpAuth: true
|
||||||
service: calibre-web@docker
|
|
||||||
internalPort: 8083
|
internalPort: 8083
|
||||||
- name: komga
|
- name: komga
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
|
@ -119,6 +119,15 @@ if [[ $(cat config.json | jq '[.services[] | select(.name=="flood" and .enabled=
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check that if calibre-web is enabled, calibre should also be enabled
|
||||||
|
if [[ $(cat config.json | jq '[.services[] | select(.name=="calibre-web" and .enabled==true)] | length') -eq 1 ]]; then
|
||||||
|
if [[ $(cat config.json | jq '[.services[] | select(.name=="calibre" and .enabled==false)] | length') -eq 1 ]]; then
|
||||||
|
echo "[$0] ERROR. Calibre-web is enabled but Calibre is not. Please either enable Calibre or disable Calibre-web as Calibre-web depends on Calibre."
|
||||||
|
echo "[$0] ******* Exiting *******"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Apply other arbitrary custom Traefik config files
|
# Apply other arbitrary custom Traefik config files
|
||||||
rm -f $f traefik/custom/custom-*
|
rm -f $f traefik/custom/custom-*
|
||||||
for f in `find samples/custom-traefik -maxdepth 1 -mindepth 1 -type f | grep -E "\.yml$|\.yaml$" | sort`; do
|
for f in `find samples/custom-traefik -maxdepth 1 -mindepth 1 -type f | grep -E "\.yml$|\.yaml$" | sort`; do
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
services:
|
||||||
|
calibre-web:
|
||||||
|
image: ghcr.io/linuxserver/calibre-web
|
||||||
|
container_name: calibre-web
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
- PGID=${PGID}
|
||||||
|
- PUID=${PUID}
|
||||||
|
- TZ=${TZ}
|
||||||
|
- DOCKER_MODS=linuxserver/mods:universal-calibre
|
||||||
|
- OAUTHLIB_RELAX_TOKEN_SCOPE=1
|
||||||
|
volumes:
|
||||||
|
- configcalibre:/config
|
|
@ -12,19 +12,6 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- configcalibre:/config
|
- configcalibre:/config
|
||||||
|
|
||||||
calibre-web:
|
|
||||||
image: ghcr.io/linuxserver/calibre-web
|
|
||||||
container_name: calibre-web
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
- PGID=${PGID}
|
|
||||||
- PUID=${PUID}
|
|
||||||
- TZ=${TZ}
|
|
||||||
- DOCKER_MODS=linuxserver/mods:universal-calibre
|
|
||||||
- OAUTHLIB_RELAX_TOKEN_SCOPE=1
|
|
||||||
volumes:
|
|
||||||
- configcalibre:/config
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
configcalibre:
|
configcalibre:
|
||||||
driver: local-persist
|
driver: local-persist
|
||||||
|
|
Loading…
Reference in New Issue