Merge pull request #190 from linuxserver/resolute-deb822

thespad · web-flow · commit 463ae82025a4 · 2026-04-18T16:49:29.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -84,11 +84,10 @@ ENV HOME="/root" \
   PATH="/lsiopy/bin:$PATH"
 
 # copy sources
-COPY sources.list /etc/apt/
+COPY ubuntu.sources /etc/apt/sources.d/ubuntu.sources
 
 RUN \
   echo "**** Ripped from Ubuntu Docker Logic ****" && \
-  rm -f /etc/apt/sources.list.d/ubuntu.sources && \
   set -xe && \
   echo '#!/bin/sh' \
     > /usr/sbin/policy-rc.d && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -84,11 +84,10 @@ ENV HOME="/root" \
   PATH="/lsiopy/bin:$PATH"
 
 # copy sources
-COPY sources.list.arm /etc/apt/sources.list
+COPY ubuntu.sources.arm /etc/apt/sources.d/ubuntu.sources
 
 RUN \
   echo "**** Ripped from Ubuntu Docker Logic ****" && \
-  rm -f /etc/apt/sources.list.d/ubuntu.sources && \
   set -xe && \
   echo '#!/bin/sh' \
     > /usr/sbin/policy-rc.d && \
diff --git a/sources.list b/sources.list
diff --git a/sources.list.arm b/sources.list.arm
diff --git a/ubuntu.sources b/ubuntu.sources
@@ -0,0 +1,11 @@
+Types: deb
+URIs: https://archive.ubuntu.com/ubuntu/
+Suites: resolute resolute-updates resolute-backports
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+Types: deb
+URIs: https://security.ubuntu.com/ubuntu/
+Suites: resolute-security
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
diff --git a/ubuntu.sources.arm b/ubuntu.sources.arm
@@ -0,0 +1,11 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports
+Suites: resolute resolute-updates resolute-backports
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+Types: deb
+URIs: https://ports.ubuntu.com/ubuntu-ports
+Suites: resolute-security
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
