From 0b642e65434558244e27ca8e61d9926573999a49 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Mon, 6 Jul 2026 21:43:50 +0000
Subject: [PATCH] Rebase to resolute

---
 .editorconfig                                    | 0
 .github/CONTRIBUTING.md                          | 0
 .github/FUNDING.yml                              | 0
 .github/ISSUE_TEMPLATE/config.yml                | 0
 .github/ISSUE_TEMPLATE/issue.bug.yml             | 0
 .github/ISSUE_TEMPLATE/issue.feature.yml         | 0
 .github/workflows/call_issue_pr_tracker.yml      | 0
 .github/workflows/call_issues_cron.yml           | 0
 .github/workflows/greetings.yml                  | 0
 .github/workflows/permissions.yml                | 0
 Dockerfile                                       | 5 ++---
 Dockerfile.aarch64                               | 5 ++---
 README.md                                        | 1 +
 readme-vars.yml                                  | 1 +
 root/etc/s6-overlay/s6-rc.d/init-plex-update/run | 2 +-
 15 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 .editorconfig
 mode change 100755 => 100644 .github/CONTRIBUTING.md
 mode change 100755 => 100644 .github/FUNDING.yml
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml
 mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml
 mode change 100755 => 100644 .github/workflows/call_issues_cron.yml
 mode change 100755 => 100644 .github/workflows/greetings.yml
 mode change 100755 => 100644 .github/workflows/permissions.yml

diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 0ad3c085..b834e3c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
+FROM ghcr.io/linuxserver/baseimage-ubuntu:resolute
 
 # set version label
 ARG BUILD_DATE
@@ -31,8 +31,7 @@ RUN \
   echo "**** install runtime packages ****" && \
   apt-get update && \
   apt-get install -y \
-    udev \
-    wget && \
+    udev && \
   echo "**** install plex ****" && \
   if [ -z ${PLEX_RELEASE+x} ]; then \
     PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 50d94551..6ec6281e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-resolute
 
 # set version label
 ARG BUILD_DATE
@@ -28,8 +28,7 @@ RUN \
   echo "**** install runtime packages ****" && \
   apt-get update && \
   apt-get install -y \
-    udev \
-    wget && \
+    udev && \
   echo "**** install plex ****" && \
   if [ -z ${PLEX_RELEASE+x} ]; then \
     PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \
diff --git a/README.md b/README.md
index e0be438f..94cffd07 100644
--- a/README.md
+++ b/README.md
@@ -371,6 +371,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.07.26:** - Rebase to Ubuntu Resolute.
 * **15.03.26:** - Allow TMPDIR to be changed to better support read-only containers
 * **15.03.26:** - Fix initial claim setup on non-root containers
 * **04.11.24:** - Add Nvidia capability needed for h265
diff --git a/readme-vars.yml b/readme-vars.yml
index 9f7a516b..17a3ccd2 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -125,6 +125,7 @@ init_diagram: |
   "plex:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.07.26:", desc: "Rebase to Ubuntu Resolute."}
   - {date: "15.03.26:", desc: "Allow TMPDIR to be changed to better support read-only containers"}
   - {date: "15.03.26:", desc: "Fix initial claim setup on non-root containers"}
   - {date: "04.11.24:", desc: "Add Nvidia capability needed for h265"}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run
index 44bab804..a1c68946 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-plex-update/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-plex-update/run
@@ -127,7 +127,7 @@ fi
 
 echo "Attempting to upgrade to: ${REMOTE_VERSION}"
 rm -f /tmp/plexmediaserver_*.deb
-wget -nv -P /tmp \
+curl -fLo "/tmp/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb" \
     "${PLEX_DOWNLOAD}/${REMOTE_VERSION}/debian/plexmediaserver_${REMOTE_VERSION}_${PLEX_ARCH}.deb"
 last=$?