From 695917c7ffa3b2a02a78badf105097cf678114d5 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 31 May 2023 21:47:01 -0400
Subject: [PATCH 1/7] use deb, simplify Dockerfiles

---
 .github/workflows/external_trigger.yml   |  2 +-
 Dockerfile                               | 63 ++++++++----------------
 Dockerfile.aarch64                       | 58 ++++++++--------------
 Dockerfile.armhf                         | 58 ++++++++--------------
 README.md                                |  1 +
 readme-vars.yml                          |  1 +
 root/etc/s6-overlay/s6-rc.d/svc-emby/run |  2 +-
 7 files changed, 67 insertions(+), 118 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 64259d3..42728db 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -72,7 +72,7 @@ jobs:
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Checking artifacts. . . ****"
             assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url')
-            if echo "$assets" | grep -q "aarch64.rpm$" && echo "$assets" | grep -q "armv7hl.rpm$" && echo "$assets" | grep -q "x86_64.rpm$"; then
+            if echo "$assets" | grep -q "arm64.deb$" && echo "$assets" | grep -q "armhf.deb$" && echo "$assets" | grep -q "amd64.deb$"; then
               echo "**** All artifacts seem to be published, triggering build ****"
               response=$(curl -iX POST \
                 https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-emby/job/master/buildWithParameters?PACKAGE_CHECK=false \
diff --git a/Dockerfile b/Dockerfile
index fe8e722..0b9e3fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,43 +1,12 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage
 
-# build args
-ARG EMBY_RELEASE
-ENV DEBIAN_FRONTEND="noninteractive" 
+# syntax=docker/dockerfile:1
 
-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/*
-
-# runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG EMBY_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
@@ -48,19 +17,29 @@ 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 \
-    netcat && \
+  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.deb -L \
+    "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-deb_${EMBY_RELEASE}_amd64.deb" && \
+  dpkg-deb -xv /tmp/emby.deb /tmp/ && \
+  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 "**** cleanup ****" && \
   rm -rf \
-    /tmp/* \
-    /var/lib/apt/lists/* \
-    /var/tmp/*
+    /tmp/*
 
 # add local files
-COPY --from=buildstage /app/emby /app/emby
 COPY root/ /
 
 # ports and volumes
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7d0237b..4329fab 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,43 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage
+# syntax=docker/dockerfile:1
 
-# 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/*
-
-# runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG EMBY_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
@@ -54,8 +22,25 @@ RUN \
   apt-get install -y --no-install-recommends \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
-    libraspberrypi0 \
-    netcat && \
+    libraspberrypi0 && \
+  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.deb -L \
+    "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-deb_${EMBY_RELEASE}_armh64.deb" && \
+  dpkg-deb -xv /tmp/emby.deb /tmp/ && \
+  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 "**** cleanup ****" && \
   rm -rf \
     /tmp/* \
@@ -63,7 +48,6 @@ RUN \
     /var/tmp/*
 
 # add local files
-COPY --from=buildstage /app/emby /app/emby
 COPY root/ /
 
 # ports and volumes
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 01b38b6..a01d542 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,43 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage
+# syntax=docker/dockerfile:1
 
-# 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/*
-
-# runtime stage
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG EMBY_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
@@ -54,8 +22,25 @@ RUN \
   apt-get install -y --no-install-recommends \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
-    libraspberrypi0 \
-    netcat && \
+    libraspberrypi0 && \
+  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.deb -L \
+    "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-deb_${EMBY_RELEASE}_armhf.deb" && \
+  dpkg-deb -xv /tmp/emby.deb /tmp/ && \
+  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 "**** cleanup ****" && \
   rm -rf \
     /tmp/* \
@@ -63,7 +48,6 @@ RUN \
     /var/tmp/*
 
 # add local files
-COPY --from=buildstage /app/emby /app/emby
 COPY root/ /
 
 # ports and volumes
diff --git a/README.md b/README.md
index d23ac7d..0c562c2 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
 
+* **31.05.23:** - Use upstream deb packages instead of rpm.
 * **26.09.22:** - Update chown behavior.
 * **18.09.22:** - Migrate to s6v3, rebase to Ubuntu Jammy.
 * **19.05.21:** - Structural changes upstream.
diff --git a/readme-vars.yml b/readme-vars.yml
index bbc9c44..7b62996 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -90,6 +90,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.05.23:", desc: "Use upstream deb packages instead of rpm." }
   - { date: "26.09.22:", desc: "Update chown behavior." }
   - { date: "18.09.22:", desc: "Migrate to s6v3, rebase to Ubuntu Jammy." }
   - { date: "19.05.21:", desc: "Structural changes upstream." }
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 fda91f8..6fe8e58 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run
@@ -10,7 +10,7 @@ fi
 export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt
 
 exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8096" \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8096" \
         s6-setuidgid abc /app/emby/EmbyServer \
         -programdata /config \
         -ffdetect /app/emby/ffdetect \

From 4467447c4637c66e87f4c86f467c1f847c531355 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Wed, 31 May 2023 21:49:45 -0400
Subject: [PATCH 2/7] typo

---
 Dockerfile.aarch64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4329fab..811558e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -32,7 +32,7 @@ RUN \
   fi && \
   curl -o \
     /tmp/emby.deb -L \
-    "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-deb_${EMBY_RELEASE}_armh64.deb" && \
+    "https://github.com/MediaBrowser/Emby.Releases/releases/download/${EMBY_RELEASE}/emby-server-deb_${EMBY_RELEASE}_arm64.deb" && \
   dpkg-deb -xv /tmp/emby.deb /tmp/ && \
   mv -t \
     /app/emby/ \

From 13d0bf8360601f95c089eaa682e081c724277867 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Jun 2023 09:28:40 -0400
Subject: [PATCH 3/7] make /tmp writable

---
 Dockerfile         | 3 ++-
 Dockerfile.aarch64 | 3 ++-
 Dockerfile.armhf   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b9e3fc..d588074 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,8 @@ RUN \
     /tmp/opt/emby-server/extra/lib/* && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* && \
+  chmod go+w /tmp
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 811558e..09b94b9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -45,7 +45,8 @@ RUN \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/*
+    /var/tmp/* && \
+  chmod go+w /tmp
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index a01d542..666773f 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -45,7 +45,8 @@ RUN \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/*
+    /var/tmp/* && \
+  chmod go+w /tmp
 
 # add local files
 COPY root/ /

From bcfe5af8e628c78249d59465ded6706c7e214d92 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Jun 2023 09:34:56 -0400
Subject: [PATCH 4/7] update ppa addition

---
 Dockerfile.aarch64 | 4 ++--
 Dockerfile.armhf   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 09b94b9..7eccb78 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -16,8 +16,8 @@ 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 && \
+  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | gpg --dearmor | tee /usr/share/keyrings/raspbins.gpg >/dev/null && \
+  echo "deb [signed-by=/usr/share/keyrings/raspbins.gpg] 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 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 666773f..b3dadf8 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -16,8 +16,8 @@ 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 && \
+  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | gpg --dearmor | tee /usr/share/keyrings/raspbins.gpg >/dev/null && \
+  echo "deb [signed-by=/usr/share/keyrings/raspbins.gpg] 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 \

From 5dc95053d82e939e5adecf759b9fcecdbea6a02d Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:28:36 -0400
Subject: [PATCH 5/7] try and fix dotnet tmp

---
 Dockerfile                                | 7 ++++---
 Dockerfile.aarch64                        | 7 ++++---
 Dockerfile.armhf                          | 7 ++++---
 root/etc/s6-overlay/s6-rc.d/init-emby/run | 4 +++-
 root/etc/s6-overlay/s6-rc.d/svc-emby/run  | 1 +
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d588074..2748564 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 RUN \
   echo "**** install emby ****" && \
   mkdir -p \
-    /app/emby && \
+    /app/emby \
+    /tmpnetcore && \
+  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
@@ -37,8 +39,7 @@ RUN \
     /tmp/opt/emby-server/extra/lib/* && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/* && \
-  chmod go+w /tmp
+    /tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7eccb78..a33f09d 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -25,7 +25,9 @@ RUN \
     libraspberrypi0 && \
   echo "**** install emby ****" && \
   mkdir -p \
-    /app/emby && \
+    /app/emby \
+    /tmpnetcore && \
+  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
@@ -45,8 +47,7 @@ RUN \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/* && \
-  chmod go+w /tmp
+    /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b3dadf8..0ced481 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -25,7 +25,9 @@ RUN \
     libraspberrypi0 && \
   echo "**** install emby ****" && \
   mkdir -p \
-    /app/emby && \
+    /app/emby \
+    /tmpnetcore && \
+  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
@@ -45,8 +47,7 @@ RUN \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/* && \
-  chmod go+w /tmp
+    /var/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/root/etc/s6-overlay/s6-rc.d/init-emby/run b/root/etc/s6-overlay/s6-rc.d/init-emby/run
index c6a10ef..a5a11d6 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-emby/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-emby/run
@@ -2,7 +2,8 @@
 
 # Create folders
 mkdir -p \
-    /data
+    /data \
+    /tmp/.dotnet/shm
 
 # check Library permissions
 PUID=${PUID:-911}
@@ -12,3 +13,4 @@ if [ -d /config/config ] && [ ! "$(stat -c %u /config/config)" = "$PUID" ]; then
     chown abc:abc -R \
         /config
 fi
+lsiown -R abc:abc /tmp/.dotnet
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 6fe8e58..428f23c 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run
@@ -2,6 +2,7 @@
 
 # env settings
 APP_DIR="/app/emby"
+export TMPDIR="/tmpnetcore"
 export LD_LIBRARY_PATH="${APP_DIR}"
 export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts
 if [ -d "/lib/x86_64-linux-gnu" ]; then

From 32d699edf28b10fb1e66eaaceea3ea19c4adc1b0 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:54:39 -0400
Subject: [PATCH 6/7] handle tmp folders runtime

---
 Dockerfile                                | 1 -
 Dockerfile.aarch64                        | 1 -
 Dockerfile.armhf                          | 1 -
 root/etc/s6-overlay/s6-rc.d/init-emby/run | 5 +++--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2748564..ea86bc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,6 @@ RUN \
   mkdir -p \
     /app/emby \
     /tmpnetcore && \
-  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index a33f09d..ecb03ee 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -27,7 +27,6 @@ RUN \
   mkdir -p \
     /app/emby \
     /tmpnetcore && \
-  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 0ced481..ec40aba 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -27,7 +27,6 @@ RUN \
   mkdir -p \
     /app/emby \
     /tmpnetcore && \
-  chmod go+w /tmpnetcore && \
   if [ -z ${EMBY_RELEASE+x} ]; then \
     EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
     | jq -r '. | .tag_name'); \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-emby/run b/root/etc/s6-overlay/s6-rc.d/init-emby/run
index a5a11d6..e371769 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-emby/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-emby/run
@@ -10,7 +10,8 @@ PUID=${PUID:-911}
 if [ -d /config/config ] && [ ! "$(stat -c %u /config/config)" = "$PUID" ]; then
     echo "Change in ownership detected, please be patient while we chown existing files"
     echo "This could take some time"
-    chown abc:abc -R \
+    lsiown abc:abc -R \
         /config
 fi
-lsiown -R abc:abc /tmp/.dotnet
+lsiown abc:abc /tmpnetcore
+chmod 777 /tmp/{.dotnet,.dotnet/shm}

From 52e945dd6270dce32292407a2c80dab34498ca46 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 1 Jun 2023 13:16:43 -0400
Subject: [PATCH 7/7] formatting

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ea86bc5..460cd6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-
 # syntax=docker/dockerfile:1
 
 FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy