From f30b0eeeac46173accbc29c06b3615221e28e05c Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sun, 28 Jul 2024 14:48:15 -0700
Subject: [PATCH] updated and tested Jellyfin

---
 jellyfin/README.md          | 16 ++++++++++++
 jellyfin/docker-compose.yml | 51 ++++++++++---------------------------
 jellyfin/sample-extends.yml |  7 +++++
 jellyfin/sample.env         |  6 +++++
 4 files changed, 43 insertions(+), 37 deletions(-)
 create mode 100644 jellyfin/README.md
 create mode 100644 jellyfin/sample-extends.yml
 create mode 100644 jellyfin/sample.env

diff --git a/jellyfin/README.md b/jellyfin/README.md
new file mode 100644
index 0000000..fc346e9
--- /dev/null
+++ b/jellyfin/README.md
@@ -0,0 +1,16 @@
+# jellyfin
+
+Last Updated: Sun July 28, 2024 14:30:43 PDT
+
+## Overview
+
+* [DockerHub jellyfin](https://hub.docker.com/r/jellyfin/jellyfin)
+* [Docs](https://jellyfin.org/docs/)
+
+### Ports
+
+* 8096/tcp is used by default for HTTP traffic. You can change this in the dashboard.
+* 8920/tcp is used by default for HTTPS traffic. You can change this in the dashboard.
+* 1900/udp is used for service auto-discovery. This is not configurable.
+* 7359/udp is also used for auto-discovery. This is not configurable.
+
diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
index 4e9b720..4914810 100644
--- a/jellyfin/docker-compose.yml
+++ b/jellyfin/docker-compose.yml
@@ -1,41 +1,18 @@
----
-version: "3"
-
-###########################################################################################################################
-# Jellyfin
-# 
-# LINKS
-# * [DockerHub jellyfin](https://hub.docker.com/r/jellyfin/jellyfin)
-# * [DockerHub Mariadb](https://hub.docker.com/_/mariadb/)
-# * [Docs](https://jellyfin.org/docs/)
-#
-# Notes:
-# Static Ports
-# * 8096/tcp is used by default for HTTP traffic. You can change this in the dashboard.
-# * 8920/tcp is used by default for HTTPS traffic. You can change this in the dashboard.
-# * 1900/udp is used for service auto-discovery. This is not configurable.
-# * 7359/udp is also used for auto-discovery. This is not configurable.
-#
-# SAMPLE ENV
-# APP_URL: http://localhost:8096
-###########################################################################################################################
+version: '3.8'
 
 services:
-
   jellyfin:
-    image: jellyfin/jellyfin:latest
-    restart: always
-    volumes:
-      - ./data/config:/config
-      - ./data/cache:/cache
-      - ./data/content/media:/media
-      - ./data/content/books:/books
-      - ./data/content/movies:/movies
-      - ./data/content/music:/music
-      - ./data/content/musicvideos:/musicvideos
-      - ./data/content/photos:/photos
-      - ./data/content/shows:/shows
-    ports: 
-      - "8096:8096"
+    image: ${JELLYFIN_IMAGE:-jellyfin/jellyfin:latest}
+    restart: unless-stopped
     environment:
-      - JELLYFIN_PublishedServerUrl=${APP_URL:-http://localhost:8096}
+      - JELLYFIN_PublishedServerUrl=${JELLYFIN_PublishedServerUrl:-http://localhost:8096}
+    volumes:
+      - ${VOL_PATH:-./data}/jellyfin-cache:/cache
+      - ${VOL_PATH:-./data}/jellyfin-config:/config
+      - ${VOL_PATH:-./data}/jellyfin-content/books:/books
+      - ${VOL_PATH:-./data}/jellyfin-content/media:/media
+      - ${VOL_PATH:-./data}/jellyfin-content/movies:/movies
+      - ${VOL_PATH:-./data}/jellyfin-content/music:/music
+      - ${VOL_PATH:-./data}/jellyfin-content/musicvideos:/musicvideos
+      - ${VOL_PATH:-./data}/jellyfin-content/photos:/photos
+      - ${VOL_PATH:-./data}/jellyfin-content/shows:/shows
diff --git a/jellyfin/sample-extends.yml b/jellyfin/sample-extends.yml
new file mode 100644
index 0000000..d04113f
--- /dev/null
+++ b/jellyfin/sample-extends.yml
@@ -0,0 +1,7 @@
+version: '3.4'
+
+services:
+  jellyfin:
+    extends:
+      file: ${COOKBOOK}/jellyfin/docker-compose.yml
+      service: jellyfin
diff --git a/jellyfin/sample.env b/jellyfin/sample.env
new file mode 100644
index 0000000..4002612
--- /dev/null
+++ b/jellyfin/sample.env
@@ -0,0 +1,6 @@
+
+COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
+# jellyfin
+JELLYFIN_IMAGE=jellyfin/jellyfin:latest
+VOL_PATH=./data
+JELLYFIN_PublishedServerUrl=http://localhost:8096
\ No newline at end of file