diff --git a/Dockerfile b/Dockerfile index a7d3960e..c3d262e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,17 @@ ENV ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb /dev/vchiq /dev/video1? -type c" # install packages RUN \ + echo "**** add emby deps *****" && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libexpat1 && \ echo "**** install emby ****" && \ mkdir -p \ /app/emby \ /tmp/emby && \ if [ -z ${EMBY_RELEASE+x} ]; then \ EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \ - | jq -r '. | .tag_name'); \ + | jq -r '. | .tag_name'); \ fi && \ curl -o \ /tmp/emby.deb -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b78ceb35..ebc9638d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -19,6 +19,7 @@ RUN \ echo "**** add emby deps *****" && \ apt-get update && \ apt-get install -y --no-install-recommends \ + libexpat1 \ libomxil-bellagio0 \ libomxil-bellagio-bin \ libraspberrypi0 && \ @@ -28,7 +29,7 @@ RUN \ /tmp/emby && \ if [ -z ${EMBY_RELEASE+x} ]; then \ EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \ - | jq -r '. | .tag_name'); \ + | jq -r '. | .tag_name'); \ fi && \ curl -o \ /tmp/emby.deb -L \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/run b/root/etc/s6-overlay/s6-rc.d/svc-emby/run index 3ef960b7..9a43109f 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run @@ -3,7 +3,6 @@ # env settings APP_DIR="/app/emby" -export LD_LIBRARY_PATH="${APP_DIR}"/lib:"${APP_DIR}"/extra/lib export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts export OCL_ICD_VENDORS="${APP_DIR}"/extra/etc/OpenCL/vendors export AMDGPU_IDS="${APP_DIR}"/extra/share/libdrm/amdgpu.ids @@ -16,7 +15,7 @@ export HOME="/config" exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8096" \ - s6-setuidgid abc /app/emby/system/EmbyServer \ + cd /app/emby env LD_LIBRARY_PATH="${APP_DIR}"/lib:"${APP_DIR}"/extra/lib s6-setuidgid abc /app/emby/system/EmbyServer \ -programdata /config \ -ffdetect /app/emby/bin/ffdetect \ -ffmpeg /app/emby/bin/ffmpeg \