move nfs volume definitions to media compose

brettinternet · Jun 26, 2024 · e6f6cfc · e6f6cfc
1 parent 84c8b62
commit e6f6cfc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 40 deletions.
diff --git a/docker/compose.media.yaml b/docker/compose.media.yaml
@@ -8,6 +8,40 @@ x-options: &options
     restart_policy:
       condition: unless-stopped
 
+x-media-volume:
+  driver_opts: &media_driver_opts
+    type: nfs
+    o: addr=${MEDIA_IP},hard,timeo=600,retrans=3,proto=tcp,nfsvers=4.2,port=2049,rsize=4096,wsize=4096,noacl,nocto,noatime,nodiratime
+    device: :/
+
+# TODO: use new volume subpaths feature: https://docs.docker.com/compose/compose-file/05-services/#volumes
+volumes:
+  media:
+    name: media
+    driver_opts:
+      <<: *media_driver_opts
+      device: :/media
+  media_library:
+    name: media_library
+    driver_opts:
+      <<: *media_driver_opts
+      device: :/media/library
+  books:
+    name: books
+    driver_opts:
+      <<: *media_driver_opts
+      device: :/media/library/books
+  usenet:
+    name: usenet
+    driver_opts:
+      <<: *media_driver_opts
+      device: :/media/usenet
+  cameras:
+    name: cameras
+    driver_opts:
+      <<: *media_driver_opts
+      device: :/media/cameras
+
 services:
   plex:
     <<: *options

diff --git a/docker/compose.utils.yaml b/docker/compose.utils.yaml
@@ -8,46 +8,6 @@ x-options: &options
     restart_policy:
       condition: unless-stopped
 
-x-media-volume:
-  driver_opts: &media_driver_opts
-    type: nfs
-    o: addr=${MEDIA_IP},hard,timeo=600,retrans=3,proto=tcp,nfsvers=4.2,port=2049,rsize=4096,wsize=4096,noacl,nocto,noatime,nodiratime
-    device: :/
-
-x-media-volume-nocache:
-  driver_opts: &media_driver_nocache_opts
-    type: nfs
-    o: addr=${MEDIA_IP},hard,timeo=600,retrans=3,proto=tcp,nfsvers=4.2,port=2049,rsize=4096,wsize=4096,noacl,nocto,noatime,nodiratime,fg,noac,lookupcache=none
-    device: :/
-
-# TODO: use new volume subpaths feature: https://docs.docker.com/compose/compose-file/05-services/#volumes
-volumes:
-  media:
-    name: media
-    driver_opts:
-      <<: *media_driver_opts
-      device: :/media
-  media_library:
-    name: media_library
-    driver_opts:
-      <<: *media_driver_opts
-      device: :/media/library
-  books:
-    name: books
-    driver_opts:
-      <<: *media_driver_opts
-      device: :/media/library/books
-  usenet:
-    name: usenet
-    driver_opts:
-      <<: *media_driver_nocache_opts
-      device: :/media/usenet
-  cameras:
-    name: cameras
-    driver_opts:
-      <<: *media_driver_opts
-      device: :/media/cameras
-
 services:
   cloudflare-ddns:
     <<: *options