diff --git a/Multimedia/Jellyfin/README.md b/Multimedia/Jellyfin/README.md index 1ac15b90..fca5089f 100644 --- a/Multimedia/Jellyfin/README.md +++ b/Multimedia/Jellyfin/README.md @@ -52,7 +52,7 @@ docker compose -f docker-compose-traefik.yml up -d Ouvrir une page web avec l'url : Pour une utilisation tout seul - http://10.0.4.29:3000 + http://10.0.4.29:8096 Pour une utilisation avec Traefik diff --git a/Multimedia/Jellyfin/docker-compose-traefik.yml b/Multimedia/Jellyfin/docker-compose-traefik.yml index 40514b3e..555d023f 100644 --- a/Multimedia/Jellyfin/docker-compose-traefik.yml +++ b/Multimedia/Jellyfin/docker-compose-traefik.yml @@ -1,66 +1,42 @@ -![Fichier-Stockage](./img/logo-Fichier-Stockage.png) -URL : HHHHH +#### NETWORKS +networks: + docker-traefik_front_network: + external: true + back_network: + driver: bridge + attachable: true -# Fichier-Stockage - -GGGGG - -# Téléchargement, Configuration et Lancement - -## Téléchargement de Fichier-Stockage - -Saisir la commande pour télécharger la source -```bash -git clone https://git.tips-of-mine.fr/Tips-Of-Mine/Docker.git -``` - -Saisir la commande pour vous rendre dans le dossier -```bash -cd AAAAA\Fichier-Stockage -``` - -## Modifier la configuration de Fichier-Stockage - -Saisir la commande pour vous rendre dans le dossier -```bash -cd AAAAA\Fichier-Stockage -``` - -Nous éditons le fichier de configuration -```bash -nano .env -``` - -Nous modifions les variables dont nous avons besoin. - -## Lancement de Fichier-Stockage - -Pour utiliser Fichier-Stockage tout seul -```bash -docker compose up -d -``` - -Pour utiliser Fichier-Stockage avec Traefik -```bash -docker compose -f docker-compose-traefik.yml up -d -``` - -# Utilisation - -## Accueil - -Ouvrir une page web avec l'url : -Pour une utilisation tout seul - - http://10.0.4.29:3000 - -Pour une utilisation avec Traefik - - https://Fichier-Stockage.10.0.4.29.traefik.me`)" - - -# More info -- more information on the website [Tips-Of-Mine](https://www.tips-of-mine.fr/) - -# Buy me a coffe -Buy Me a Coffee at ko-fi.com +#### SERVICES +services: +### jellyfin + jellyfin: + container_name: jellyfin-app + hostname: jellyfin-app + image: jellyfin/jellyfin + user: 1000:1000 + environment: + - TZ=Europe/Paris + volumes: + - ./jellyfin/config:/config + - ./jellyfin/cache:/cache + - ./Films:/Films:ro + - ./TVShows:/TVShows:ro + - ./Audiobooks:/Audiobooks:ro + - ./Music:/Music:ro + restart: unless-stopped + networks: + docker-traefik_front_network: + labels: + - "traefik.enable=true" + - "traefik.docker.network=docker-traefik_front_network" +## HTTP + - "traefik.http.routers.jellyfin-http.rule=Host(`jellyfin.10.0.4.29.traefik.me`)" + - "traefik.http.routers.jellyfin-http.entrypoints=http" +## HTTPS + - "traefik.http.routers.jellyfin-https.rule=Host(`jellyfin.10.0.4.29.traefik.me`)" + - "traefik.http.routers.jellyfin-https.entrypoints=https" + - "traefik.http.routers.jellyfin-https.tls=true" + - "traefik.http.routers.jellyfin.service=jellyfin-service" +## Middleware +## Service + - "traefik.http.services.jellyfin-service.loadbalancer.server.port=8096" diff --git a/Multimedia/Jellyfin/docker-compose.yaml b/Multimedia/Jellyfin/docker-compose.yaml deleted file mode 100644 index 4be9b7cc..00000000 --- a/Multimedia/Jellyfin/docker-compose.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: "2" -services: - jellyfin: - image: jellyfin/jellyfin - container_name: jellyfin - group_add: - - '107' # This needs to be the group id of your GPU, e.g., `stat -c '%g' /dev/dri/renderD128` on the docker host for iGPU - environment: - - TZ=Europe/London - volumes: - - ./jellyfin/config:/config - - ./jellyfin/cache:/cache - - /films:/films - # - /home/ubuntu/YOUR_NAS/Films:/Films:ro - # - /home/ubuntu/YOUR_NAS/TVShows:/TVShows:ro - # - /home/ubuntu/YOUR_NAS/Audiobooks:/Audiobooks:ro - # - /home/ubuntu/YOUR_NAS/Music:/Music:ro - ports: # You will need to uncomment if you aren't running through a proxy - - 8096:8096 - - 8920:8920 #optional - - 7359:7359/udp #optional - - 1900:1900/udp #optional - devices: # uncomment these and amend if you require GPU accelerated transcoding - - /dev/dri/renderD128:/dev/dri/renderD128 - restart: unless-stopped \ No newline at end of file diff --git a/Multimedia/Jellyfin/docker-compose.yml b/Multimedia/Jellyfin/docker-compose.yml index d9f79e47..ce94b407 100644 --- a/Multimedia/Jellyfin/docker-compose.yml +++ b/Multimedia/Jellyfin/docker-compose.yml @@ -1,46 +1,32 @@ -version: "2" -services: - jellyfin: - image: jellyfin/jellyfin - container_name: jellyfin - user: 1000:1000 - #group_add: - # - '109' # This needs to be the group id of running `stat -c '%g' /dev/dri/renderD128` on the docker host - environment: - - TZ=Europe/London - volumes: - - /home/ubuntu/docker/jellyfin/config:/config - - /home/ubuntu/docker/jellyfin/cache:/cache - - /home/ubuntu/YOUR_NAS/Films:/Films:ro - - /home/ubuntu/YOUR_NAS/TVShows:/TVShows:ro - - /home/ubuntu/YOUR_NAS/Audiobooks:/Audiobooks:ro - - /home/ubuntu/YOUR_NAS/Music:/Music:ro - #ports: You will need to uncomment if you aren't running through a proxy - # - 8096:8096 - # - 8920:8920 #optional - # - 7359:7359/udp #optional - # - 1900:1900/udp #optional - #devices: uncomment these and amend if you require GPU accelerated transcoding - # - /dev/dri/renderD128:/dev/dri/renderD128 - # - /dev/dri/card0:/dev/dri/card0 - restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.jellyfin.entrypoints=http" - - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.YOUR_DOMAIN.co.uk`)" - - "traefik.http.middlewares.jellyfin-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.jellyfin.middlewares=jellyfin-https-redirect" - - "traefik.http.routers.jellyfin-secure.entrypoints=https" - - "traefik.http.routers.jellyfin-secure.rule=Host(`jellyfin.YOUR_DOMAIN.co.uk`)" - - "traefik.http.routers.jellyfin-secure.tls=true" - - "traefik.http.routers.jellyfin-secure.service=jellyfin" - - "traefik.http.services.jellyfin.loadbalancer.server.port=8096" - - "traefik.docker.network=proxy" - networks: - proxy: - security_opt: - - no-new-privileges:true - +#### NETWORKS networks: - proxy: - external: true + back_network: + driver: bridge + attachable: true + +#### SERVICES +services: +### jellyfin + jellyfin: + container_name: jellyfin-app + hostname: jellyfin-app + image: jellyfin/jellyfin + user: 1000:1000 + environment: + - TZ=Europe/Paris + volumes: + - ./jellyfin/config:/config + - ./jellyfin/cache:/cache + - ./Films:/Films:ro + - ./TVShows:/TVShows:ro + - ./Audiobooks:/Audiobooks:ro + - ./Music:/Music:ro + ports: + - 8096:8096 + - 8920:8920 #optional + - 7359:7359/udp #optional + - 1900:1900/udp #optional + restart: unless-stopped + networks: + back_network: +