From b301beebaac1aa99342541cad5162a98374954fe Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 17 Apr 2026 16:31:46 +0000 Subject: [PATCH 1/2] Use deb822 format for sources --- Dockerfile | 3 +-- Dockerfile.aarch64 | 3 +-- sources.list | 12 ------------ sources.list.arm | 12 ------------ ubuntu.sources | 11 +++++++++++ ubuntu.sources.arm | 11 +++++++++++ 6 files changed, 24 insertions(+), 28 deletions(-) delete mode 100644 sources.list delete mode 100644 sources.list.arm create mode 100644 ubuntu.sources create mode 100644 ubuntu.sources.arm diff --git a/Dockerfile b/Dockerfile index 6c1842f..8e23265 100644 --- 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 index 8e65e1b..663ed04 100644 --- 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 deleted file mode 100644 index d7df8ce..0000000 --- a/sources.list +++ /dev/null @@ -1,12 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ resolute main restricted -deb-src http://archive.ubuntu.com/ubuntu/ resolute main restricted -deb http://archive.ubuntu.com/ubuntu/ resolute-updates main restricted -deb-src http://archive.ubuntu.com/ubuntu/ resolute-updates main restricted -deb http://archive.ubuntu.com/ubuntu/ resolute universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ resolute universe multiverse -deb http://archive.ubuntu.com/ubuntu/ resolute-updates universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ resolute-updates universe multiverse -deb http://archive.ubuntu.com/ubuntu/ resolute-security main restricted -deb-src http://archive.ubuntu.com/ubuntu/ resolute-security main restricted -deb http://archive.ubuntu.com/ubuntu/ resolute-security universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ resolute-security universe multiverse diff --git a/sources.list.arm b/sources.list.arm deleted file mode 100644 index c402cd8..0000000 --- a/sources.list.arm +++ /dev/null @@ -1,12 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute universe -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe diff --git a/ubuntu.sources b/ubuntu.sources new file mode 100644 index 0000000..8037ce0 --- /dev/null +++ b/ubuntu.sources @@ -0,0 +1,11 @@ +Types: deb +URIs: https://archive.ubuntu.com/ubuntu/ +Suites: noble noble-updates noble-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + +Types: deb +URIs: https://security.ubuntu.com/ubuntu/ +Suites: noble-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 new file mode 100644 index 0000000..cf1db3d --- /dev/null +++ b/ubuntu.sources.arm @@ -0,0 +1,11 @@ +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports +Suites: noble noble-updates noble-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: noble-security +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg From 835fa44fbb78e2ba92f455962489efd220528be2 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 18 Apr 2026 14:58:46 +0000 Subject: [PATCH 2/2] Use resolute sources for resolute --- ubuntu.sources | 4 ++-- ubuntu.sources.arm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu.sources b/ubuntu.sources index 8037ce0..e7c3dbe 100644 --- a/ubuntu.sources +++ b/ubuntu.sources @@ -1,11 +1,11 @@ Types: deb URIs: https://archive.ubuntu.com/ubuntu/ -Suites: noble noble-updates noble-backports +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: noble-security +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 index cf1db3d..677d613 100644 --- a/ubuntu.sources.arm +++ b/ubuntu.sources.arm @@ -1,11 +1,11 @@ Types: deb URIs: http://ports.ubuntu.com/ubuntu-ports -Suites: noble noble-updates noble-backports +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: noble-security +Suites: resolute-security Components: main restricted universe multiverse Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg