From e5654e826668e6b8cb611e0bf1fd20f8954a6002 Mon Sep 17 00:00:00 2001 From: SIGKILL64 Date: Thu, 22 Dec 2022 06:58:39 +0000 Subject: [PATCH] abaaba --- custom.env.example | 1 + docker-compose.gen | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/custom.env.example b/custom.env.example index bae12ed..321047f 100644 --- a/custom.env.example +++ b/custom.env.example @@ -6,6 +6,7 @@ # genery TZ=Asia/Shanghai +VOLUME_PATH=/mnt/volume # docker build args ARGS_APK_MIRROR='mirrors.aliyun.com' diff --git a/docker-compose.gen b/docker-compose.gen index 33a9512..3a68483 100755 --- a/docker-compose.gen +++ b/docker-compose.gen @@ -26,9 +26,9 @@ SMB_UID_ADMIN=$(id -u ${SMB_UNAME_ADMIN}) # media(jellyfin) service MEDIA_UGID=$(stat -c '%u:%g' "${MEDIA_PATH}") -_VIDEO_DEV='/dev/dri/renderD128' -if [ -c "${_VIDEO_DEV}" ]; then - MEDIA_GID_RENDER=$(stat -c '%g' "${_VIDEO_DEV}") +DEV_DRI_RENDER='/dev/dri/renderD128' +if [ -c "${DEV_DRI_RENDER}" ]; then + MEDIA_GID_RENDER=$(stat -c '%g' "${DEV_DRI_RENDER}") fi cat <<-EOF >docker-compose.yml @@ -148,7 +148,8 @@ services: user: ${MEDIA_UGID} group_add:$( \ if [ -n "${MEDIA_GID_RENDER}" ]; then - echo " - ${MEDIA_GID_RENDER}" + echo + echo " - \"${MEDIA_GID_RENDER}\"" fi)$( \ for GNAME in "${MEDIA_GNAME_EXTRA[@]}"; do echo @@ -163,13 +164,17 @@ services: dns: - ${DNS_IP} volumes: - - jellyfin_config:/config - - jellyfin_cache:/cache - - ${MEDIA_PATH}:/media$( \ - if [ -c "${_VIDEO_DEV}" ]; then - echo ' devices:' + - ${VOLUME_PATH}/jellyfin/config:/config + - ${VOLUME_PATH}/jellyfin/cache:/cache + - ${MEDIA_PATH}:/media + devices:$( \ + if [ -c "${DEV_DRI_RENDER}" ]; then + echo echo ' - /dev/dri:/dev/dri' - fi) + fi)$( \ + ls /dev/video* >/dev/null 2>&1 && echo && for dev in /dev/video*; do + echo " - $dev:$dev" + done) depends_on: - smartdns restart: unless-stopped @@ -227,7 +232,5 @@ networks: volumes: smartdns_cache: - jellyfin_config: - jellyfin_cache: motd_data: EOF