From 5530299be26f912f8bdea42f3c8d184ecc5521dc Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 17 Sep 2022 17:21:54 +0100 Subject: [PATCH] Migrate to s6v3 --- Dockerfile | 76 +++++++++-------- Dockerfile.aarch64 | 84 ++++++++++--------- Dockerfile.armhf | 84 ++++++++++--------- Jenkinsfile | 2 +- README.md | 1 + readme-vars.yml | 1 + .../init-config-end/dependencies.d/init-video | 0 .../init-emby/dependencies.d/init-config | 0 .../s6-rc.d/init-emby/run} | 13 +-- root/etc/s6-overlay/s6-rc.d/init-emby/type | 1 + root/etc/s6-overlay/s6-rc.d/init-emby/up | 1 + .../init-video/dependencies.d/init-emby | 0 .../s6-rc.d/init-video/run} | 0 root/etc/s6-overlay/s6-rc.d/init-video/type | 1 + root/etc/s6-overlay/s6-rc.d/init-video/up | 1 + .../svc-emby/dependencies.d/init-services | 0 .../svc-emby/dependencies.d/init-video | 0 .../s6-rc.d/svc-emby/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-emby/run | 18 ++++ root/etc/s6-overlay/s6-rc.d/svc-emby/type | 1 + .../s6-rc.d/user/contents.d/init-emby | 0 .../s6-rc.d/user/contents.d/init-video | 0 .../s6-rc.d/user/contents.d/svc-emby | 0 root/etc/services.d/emby/run | 24 ------ 24 files changed, 159 insertions(+), 150 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-video create mode 100644 root/etc/s6-overlay/s6-rc.d/init-emby/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-emby/run} (70%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-emby/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-emby/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-emby rename root/etc/{cont-init.d/40-gid-video => s6-overlay/s6-rc.d/init-video/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-video create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-emby/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-emby/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-emby/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-emby create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-emby delete mode 100644 root/etc/services.d/emby/run diff --git a/Dockerfile b/Dockerfile index 17892cf..7823a13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,39 +1,39 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage # build args ARG EMBY_RELEASE ENV DEBIAN_FRONTEND="noninteractive" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cpio \ - jq \ - rpm2cpio && \ - echo "**** install emby ****" && \ - mkdir -p \ - /app/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'); \ - fi && \ - curl -o \ - /tmp/emby.rpm -L \ - "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_x86_64.rpm" && \ - cd /tmp && \ - rpm2cpio emby.rpm \ - | cpio -i --make-directories && \ - mv -t \ - /app/emby/ \ - /tmp/opt/emby-server/system/* \ - /tmp/opt/emby-server/lib/* \ - /tmp/opt/emby-server/bin/ff* \ - /tmp/opt/emby-server/etc \ - /tmp/opt/emby-server/extra/lib/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cpio \ + jq \ + rpm2cpio && \ + echo "**** install emby ****" && \ + mkdir -p \ + /app/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'); \ + fi && \ + curl -o \ + /tmp/emby.rpm -L \ + "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_x86_64.rpm" && \ + cd /tmp && \ + rpm2cpio emby.rpm \ + | cpio -i --make-directories && \ + mv -t \ + /app/emby/ \ + /tmp/opt/emby-server/system/* \ + /tmp/opt/emby-server/lib/* \ + /tmp/opt/emby-server/bin/ff* \ + /tmp/opt/emby-server/etc \ + /tmp/opt/emby-server/extra/lib/* # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -41,20 +41,22 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +ARG DEBIAN_FRONTEND="noninteractive" + # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" # install packages RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - mesa-va-drivers && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + mesa-va-drivers && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY --from=buildstage /app/emby /app/emby diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 86c7830..49c48db 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,39 +1,39 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage # build args ARG EMBY_RELEASE ENV DEBIAN_FRONTEND="noninteractive" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cpio \ - jq \ - rpm2cpio && \ - echo "**** install emby ****" && \ - mkdir -p \ - /app/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'); \ - fi && \ - curl -o \ - /tmp/emby.rpm -L \ - "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_aarch64.rpm" && \ - cd /tmp && \ - rpm2cpio emby.rpm \ - | cpio -i --make-directories && \ - mv -t \ - /app/emby/ \ - /tmp/opt/emby-server/system/* \ - /tmp/opt/emby-server/lib/* \ - /tmp/opt/emby-server/bin/ff* \ - /tmp/opt/emby-server/etc \ - /tmp/opt/emby-server/extra/lib/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cpio \ + jq \ + rpm2cpio && \ + echo "**** install emby ****" && \ + mkdir -p \ + /app/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'); \ + fi && \ + curl -o \ + /tmp/emby.rpm -L \ + "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_aarch64.rpm" && \ + cd /tmp && \ + rpm2cpio emby.rpm \ + | cpio -i --make-directories && \ + mv -t \ + /app/emby/ \ + /tmp/opt/emby-server/system/* \ + /tmp/opt/emby-server/lib/* \ + /tmp/opt/emby-server/bin/ff* \ + /tmp/opt/emby-server/etc \ + /tmp/opt/emby-server/extra/lib/* # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -41,23 +41,25 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +ARG DEBIAN_FRONTEND="noninteractive" + # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" RUN \ - echo "**** add emby deps *****" && \ - curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ - echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - libomxil-bellagio0 \ - libomxil-bellagio-bin \ - libraspberrypi0 && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add emby deps *****" && \ + curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ + echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libomxil-bellagio0 \ + libomxil-bellagio-bin \ + libraspberrypi0 && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY --from=buildstage /app/emby /app/emby diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f919981..fdb8c55 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,39 +1,39 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage # build args ARG EMBY_RELEASE ENV DEBIAN_FRONTEND="noninteractive" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cpio \ - jq \ - rpm2cpio && \ - echo "**** install emby ****" && \ - mkdir -p \ - /app/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'); \ - fi && \ - curl -o \ - /tmp/emby.rpm -L \ - "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_armv7hl.rpm" && \ - cd /tmp && \ - rpm2cpio emby.rpm \ - | cpio -i --make-directories && \ - mv -t \ - /app/emby/ \ - /tmp/opt/emby-server/system/* \ - /tmp/opt/emby-server/lib/* \ - /tmp/opt/emby-server/bin/ff* \ - /tmp/opt/emby-server/etc \ - /tmp/opt/emby-server/extra/lib/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cpio \ + jq \ + rpm2cpio && \ + echo "**** install emby ****" && \ + mkdir -p \ + /app/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'); \ + fi && \ + curl -o \ + /tmp/emby.rpm -L \ + "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-rpm_${EMBY_RELEASE}_armv7hl.rpm" && \ + cd /tmp && \ + rpm2cpio emby.rpm \ + | cpio -i --make-directories && \ + mv -t \ + /app/emby/ \ + /tmp/opt/emby-server/system/* \ + /tmp/opt/emby-server/lib/* \ + /tmp/opt/emby-server/bin/ff* \ + /tmp/opt/emby-server/etc \ + /tmp/opt/emby-server/extra/lib/* # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE @@ -41,23 +41,25 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" +ARG DEBIAN_FRONTEND="noninteractive" + # add needed nvidia environment variables for https://github.com/NVIDIA/nvidia-docker ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" RUN \ - echo "**** add emby deps *****" && \ - curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ - echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - libomxil-bellagio0 \ - libomxil-bellagio-bin \ - libraspberrypi0 && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add emby deps *****" && \ + curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ + echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libomxil-bellagio0 \ + libomxil-bellagio-bin \ + libraspberrypi0 && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY --from=buildstage /app/emby /app/emby diff --git a/Jenkinsfile b/Jenkinsfile index bfe04d6..e682088 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } diff --git a/README.md b/README.md index b8f3a45..ea9dd5d 100644 --- a/README.md +++ b/README.md @@ -289,6 +289,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.09.22:** - Migrate to s6v3. * **19.05.21:** - Structural changes upstream. * **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode. * **21.12.20:** - Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf. diff --git a/readme-vars.yml b/readme-vars.yml index d7999fe..7367482 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -90,6 +90,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.09.22:", desc: "Migrate to s6v3." } - { date: "19.05.21:", desc: "Structural changes upstream." } - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. Remove no longer used mapping for /transcode." } - { date: "21.12.20:", desc: "Rebase to Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-emby/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-emby/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-emby/run old mode 100644 new mode 100755 similarity index 70% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-emby/run index f51941f..0966463 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-emby/run @@ -2,15 +2,16 @@ # Create folders mkdir -p \ - /data \ - /transcode + /data \ + /transcode # permissions (non-recursive) on config root and folders chown abc:abc \ - /config \ - /data \ - /transcode + /config \ + /data \ + /transcode + if [ -n "$(ls -A /data 2>/dev/null)" ]; then chown abc:abc \ - /data/* + /data/* fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-emby/type b/root/etc/s6-overlay/s6-rc.d/init-emby/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-emby/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-emby/up b/root/etc/s6-overlay/s6-rc.d/init-emby/up new file mode 100644 index 0000000..202ea5d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-emby/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-emby/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-emby b/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-emby new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/40-gid-video b/root/etc/s6-overlay/s6-rc.d/init-video/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/40-gid-video rename to root/etc/s6-overlay/s6-rc.d/init-video/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/type b/root/etc/s6-overlay/s6-rc.d/init-video/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-video/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/up b/root/etc/s6-overlay/s6-rc.d/init-video/up new file mode 100644 index 0000000..5cef990 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-video/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-video/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/svc-emby/dependencies.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-emby/notification-fd new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/run b/root/etc/s6-overlay/s6-rc.d/svc-emby/run new file mode 100755 index 0000000..c2c884c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run @@ -0,0 +1,18 @@ +#!/usr/bin/with-contenv bash + +# env settings +APP_DIR="/app/emby" +export LD_LIBRARY_PATH="${APP_DIR}" +export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts +if [ -d "/lib/x86_64-linux-gnu" ]; then + export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/dri +fi +export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt + +s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8096" \ + s6-setuidgid abc /app/emby/EmbyServer \ + -programdata /config \ + -ffdetect /app/emby/ffdetect \ + -ffmpeg /app/emby/ffmpeg \ + -ffprobe /app/emby/ffprobe \ + -restartexitcode 3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/type b/root/etc/s6-overlay/s6-rc.d/svc-emby/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-emby b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-emby new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-emby b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-emby new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/emby/run b/root/etc/services.d/emby/run deleted file mode 100644 index 4d3e3c3..0000000 --- a/root/etc/services.d/emby/run +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/with-contenv bash - -# set umask -if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then - echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" - umask ${UMASK_SET} -fi - -# env settings -APP_DIR="/app/emby" -export LD_LIBRARY_PATH="${APP_DIR}" -export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts -if [ -d "/lib/x86_64-linux-gnu" ]; then - export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/dri -fi -export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt - -exec \ - s6-setuidgid abc /app/emby/EmbyServer \ - -programdata /config \ - -ffdetect /app/emby/ffdetect \ - -ffmpeg /app/emby/ffmpeg \ - -ffprobe /app/emby/ffprobe \ - -restartexitcode 3