Merge remote-tracking branch 'origin/noble' into noble-init-version

pull/166/head
thespad 2024-05-27 20:38:50 +01:00
commit 1723424a4d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 08F06191F4587860
3 zmienionych plików z 183 dodań i 198 usunięć

Wyświetl plik

@ -1,32 +1,43 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:3.19 as rootfs-stage FROM alpine:3.20 as rootfs-stage
# environment # environment
ENV REL=noble ENV REL=noble
ENV ARCH=amd64 ENV ARCH=amd64
ENV TAG=oci-noble-24.04
# install packages # install packages
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
curl \ curl \
gawk \ git \
jq \
tzdata \ tzdata \
xz xz
# grab base tarball # grab base tarball
RUN \ RUN \
BUILD_ID=$(curl -sL https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/${REL}/ubuntu-oci | awk -F'(+build|+files)' "/+build/ && /$ARCH/ {print \$2}") &&\ git clone --depth=1 https://git.launchpad.net/cloud-images/+oci/ubuntu-base -b ${TAG} /build && \
cd /build/oci && \
DIGEST=$(jq -r '.manifests[0].digest[7:]' < index.json) && \
cd /build/oci/blobs/sha256 && \
if jq -e '.layers // empty' < "${DIGEST}" >/dev/null 2>&1; then \
TARBALL=$(jq -r '.layers[0].digest[7:]' < ${DIGEST}); \
else \
MULTIDIGEST=$(jq -r ".manifests[] | select(.platform.architecture == \"${ARCH}\") | .digest[7:]" < ${DIGEST}) && \
TARBALL=$(jq -r '.layers[0].digest[7:]' < ${MULTIDIGEST}); \
fi && \
mkdir /root-out && \ mkdir /root-out && \
curl -o \
/rootfs.tar.gz -L \
https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/${REL}/ubuntu-oci/+build${BUILD_ID}+files/livecd.ubuntu-oci.rootfs.tar.gz && \
tar xf \ tar xf \
/rootfs.tar.gz -C \ ${TARBALL} -C \
/root-out && \ /root-out && \
rm -rf \ rm -rf \
/root-out/var/log/* /root-out/var/log/* \
/root-out/home/ubuntu \
/root-out/root/{.ssh,.bashrc,.profile} \
/build
# set version for s6 overlay # set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_VERSION="3.1.6.2"
@ -120,6 +131,7 @@ RUN \
gnupg \ gnupg \
jq \ jq \
netcat-openbsd \ netcat-openbsd \
systemd-standalone-sysusers \
tzdata && \ tzdata && \
echo "**** generate locale ****" && \ echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
@ -132,6 +144,7 @@ RUN \
/defaults \ /defaults \
/lsiopy && \ /lsiopy && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
userdel ubuntu && \
apt-get autoremove && \ apt-get autoremove && \
apt-get clean && \ apt-get clean && \
rm -rf \ rm -rf \

Wyświetl plik

@ -1,32 +1,43 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:3.19 as rootfs-stage FROM alpine:3.20 as rootfs-stage
# environment # environment
ENV REL=noble ENV REL=noble
ENV ARCH=arm64 ENV ARCH=arm64
ENV TAG=oci-noble-24.04
# install packages # install packages
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
bash \ bash \
curl \ curl \
gawk \ git \
jq \
tzdata \ tzdata \
xz xz
# grab base tarball # grab base tarball
RUN \ RUN \
BUILD_ID=$(curl -sL https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/${REL}/ubuntu-oci | awk -F'(+build|+files)' "/+build/ && /$ARCH/ {print \$2}") &&\ git clone --depth=1 https://git.launchpad.net/cloud-images/+oci/ubuntu-base -b ${TAG} /build && \
cd /build/oci && \
DIGEST=$(jq -r '.manifests[0].digest[7:]' < index.json) && \
cd /build/oci/blobs/sha256 && \
if jq -e '.layers // empty' < "${DIGEST}" >/dev/null 2>&1; then \
TARBALL=$(jq -r '.layers[0].digest[7:]' < ${DIGEST}); \
else \
MULTIDIGEST=$(jq -r ".manifests[] | select(.platform.architecture == \"${ARCH}\") | .digest[7:]" < ${DIGEST}) && \
TARBALL=$(jq -r '.layers[0].digest[7:]' < ${MULTIDIGEST}); \
fi && \
mkdir /root-out && \ mkdir /root-out && \
curl -o \
/rootfs.tar.gz -L \
https://launchpad.net/~cloud-images-release-managers/+livefs/ubuntu/${REL}/ubuntu-oci/+build${BUILD_ID}+files/livecd.ubuntu-oci.rootfs.tar.gz && \
tar xf \ tar xf \
/rootfs.tar.gz -C \ ${TARBALL} -C \
/root-out && \ /root-out && \
rm -rf \ rm -rf \
/root-out/var/log/* /root-out/var/log/* \
/root-out/home/ubuntu \
/root-out/root/{.ssh,.bashrc,.profile} \
/build
# set version for s6 overlay # set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_VERSION="3.1.6.2"
@ -120,6 +131,7 @@ RUN \
gnupg \ gnupg \
jq \ jq \
netcat-openbsd \ netcat-openbsd \
systemd-standalone-sysusers \
tzdata && \ tzdata && \
echo "**** generate locale ****" && \ echo "**** generate locale ****" && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
@ -137,6 +149,7 @@ RUN \
"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
chmod +x /usr/bin/qemu-aarch64-static && \ chmod +x /usr/bin/qemu-aarch64-static && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
userdel ubuntu && \
apt-get autoremove && \ apt-get autoremove && \
apt-get clean && \ apt-get clean && \
rm -rf \ rm -rf \

Wyświetl plik

@ -1,182 +1,141 @@
NAME VERSION TYPE NAME VERSION TYPE
PyGObject 3.48.2 python adduser 3.137ubuntu1 deb
adduser 3.137ubuntu1 deb apt 2.7.14build2 deb
apt 2.7.14build2 deb apt-utils 2.7.14build2 deb
apt-utils 2.7.14build2 deb base-files 13ubuntu10 deb
base-files 13ubuntu10 deb base-passwd 3.6.3build1 deb
base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb
bash 5.2.21-2ubuntu4 deb bsdutils 1:2.39.3-9ubuntu6 deb
bsdutils 1:2.39.3-9ubuntu6 deb ca-certificates 20240203 deb
ca-certificates 20240203 deb catatonit 0.1.7-1 deb
coreutils 9.4-3ubuntu6 deb coreutils 9.4-3ubuntu6 deb
cron 3.0pl1-184ubuntu2 deb cron 3.0pl1-184ubuntu2 deb
cron-daemon-common 3.0pl1-184ubuntu2 deb cron-daemon-common 3.0pl1-184ubuntu2 deb
curl 8.5.0-2ubuntu10 deb curl 8.5.0-2ubuntu10.1 deb
dash 0.5.12-6ubuntu5 deb dash 0.5.12-6ubuntu5 deb
dbus 1.14.10-4ubuntu4 deb debconf 1.5.86ubuntu1 deb
dbus-bin 1.14.10-4ubuntu4 deb debianutils 5.17build1 deb
dbus-daemon 1.14.10-4ubuntu4 deb diffutils 1:3.10-1build1 deb
dbus-python 1.3.2 python dirmngr 2.4.4-2ubuntu17 deb
dbus-session-bus-common 1.14.10-4ubuntu4 deb dpkg 1.22.6ubuntu6 deb
dbus-system-bus-common 1.14.10-4ubuntu4 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4 deb
debconf 1.5.86ubuntu1 deb findutils 4.9.0-5build1 deb
debianutils 5.17build1 deb gcc-14-base 14-20240412-0ubuntu1 deb
diffutils 1:3.10-1build1 deb gnupg 2.4.4-2ubuntu17 deb
dirmngr 2.4.4-2ubuntu17 deb gnupg-l10n 2.4.4-2ubuntu17 deb
dmsetup 2:1.02.185-3ubuntu3 deb gnupg-utils 2.4.4-2ubuntu17 deb
dpkg 1.22.6ubuntu6 deb gpg 2.4.4-2ubuntu17 deb
e2fsprogs 1.47.0-2.4~exp1ubuntu4 deb gpg-agent 2.4.4-2ubuntu17 deb
findutils 4.9.0-5build1 deb gpg-wks-client 2.4.4-2ubuntu17 deb
gcc-14-base 14-20240412-0ubuntu1 deb gpgconf 2.4.4-2ubuntu17 deb
gir1.2-girepository-2.0 1.80.1-1 deb gpgsm 2.4.4-2ubuntu17 deb
gir1.2-glib-2.0 2.80.0-6ubuntu1 deb gpgv 2.4.4-2ubuntu17 deb
gnupg 2.4.4-2ubuntu17 deb grep 3.11-4build1 deb
gnupg-l10n 2.4.4-2ubuntu17 deb gzip 1.12-1ubuntu3 deb
gnupg-utils 2.4.4-2ubuntu17 deb hostname 3.23+nmu2ubuntu2 deb
gpg 2.4.4-2ubuntu17 deb init-system-helpers 1.66ubuntu1 deb
gpg-agent 2.4.4-2ubuntu17 deb jq 1.7.1-3build1 deb
gpg-wks-client 2.4.4-2ubuntu17 deb keyboxd 2.4.4-2ubuntu17 deb
gpgconf 2.4.4-2ubuntu17 deb krb5-locales 1.20.1-6ubuntu2 deb
gpgsm 2.4.4-2ubuntu17 deb libacl1 2.3.2-1build1 deb
gpgv 2.4.4-2ubuntu17 deb libapt-pkg6.0t64 2.7.14build2 deb
grep 3.11-4build1 deb libassuan0 2.5.6-1build1 deb
gzip 1.12-1ubuntu3 deb libattr1 1:2.5.2-1build1 deb
hostname 3.23+nmu2ubuntu2 deb libaudit-common 1:3.1.2-2.1build1 deb
init-system-helpers 1.66ubuntu1 deb libaudit1 1:3.1.2-2.1build1 deb
jq 1.7.1-3build1 deb libblkid1 2.39.3-9ubuntu6 deb
keyboxd 2.4.4-2ubuntu17 deb libbrotli1 1.1.0-2build2 deb
krb5-locales 1.20.1-6ubuntu2 deb libbsd0 0.12.1-1build1 deb
libacl1 2.3.2-1build1 deb libbz2-1.0 1.0.8-5.1 deb
libapparmor1 4.0.0-beta3-0ubuntu3 deb libc-bin 2.39-0ubuntu8.1 deb
libapt-pkg6.0t64 2.7.14build2 deb libc6 2.39-0ubuntu8.1 deb
libargon2-1 0~20190702+dfsg-4build1 deb libcap-ng0 0.8.4-2build2 deb
libassuan0 2.5.6-1build1 deb libcap2 1:2.66-5ubuntu2 deb
libattr1 1:2.5.2-1build1 deb libcom-err2 1.47.0-2.4~exp1ubuntu4 deb
libaudit-common 1:3.1.2-2.1build1 deb libcrypt1 1:4.4.36-4build1 deb
libaudit1 1:3.1.2-2.1build1 deb libcurl4t64 8.5.0-2ubuntu10.1 deb
libblkid1 2.39.3-9ubuntu6 deb libdb5.3t64 5.3.28+dfsg2-7 deb
libbrotli1 1.1.0-2build2 deb libdebconfclient0 0.271ubuntu3 deb
libbsd0 0.12.1-1build1 deb libext2fs2t64 1.47.0-2.4~exp1ubuntu4 deb
libbz2-1.0 1.0.8-5.1 deb libffi8 3.4.6-1build1 deb
libc-bin 2.39-0ubuntu8 deb libgcc-s1 14-20240412-0ubuntu1 deb
libc6 2.39-0ubuntu8 deb libgcrypt20 1.10.3-2build1 deb
libcap-ng0 0.8.4-2build2 deb libgmp10 2:6.3.0+dfsg-2ubuntu6 deb
libcap2 1:2.66-5ubuntu2 deb libgnutls30t64 3.8.3-1.1ubuntu3.1 deb
libcom-err2 1.47.0-2.4~exp1ubuntu4 deb libgpg-error0 1.47-3build2 deb
libcrypt1 1:4.4.36-4build1 deb libgssapi-krb5-2 1.20.1-6ubuntu2 deb
libcryptsetup12 2:2.7.0-1ubuntu4 deb libhogweed6t64 3.9.1-2.2build1 deb
libcurl4t64 8.5.0-2ubuntu10 deb libidn2-0 2.3.7-2build1 deb
libdb5.3t64 5.3.28+dfsg2-7 deb libjq1 1.7.1-3build1 deb
libdbus-1-3 1.14.10-4ubuntu4 deb libk5crypto3 1.20.1-6ubuntu2 deb
libdebconfclient0 0.271ubuntu3 deb libkeyutils1 1.6.3-3build1 deb
libdevmapper1.02.1 2:1.02.185-3ubuntu3 deb libkrb5-3 1.20.1-6ubuntu2 deb
libexpat1 2.6.1-2build1 deb libkrb5support0 1.20.1-6ubuntu2 deb
libext2fs2t64 1.47.0-2.4~exp1ubuntu4 deb libksba8 1.6.6-1build1 deb
libfdisk1 2.39.3-9ubuntu6 deb libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb
libffi8 3.4.6-1build1 deb libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb
libgcc-s1 14-20240412-0ubuntu1 deb liblz4-1 1.9.4-1build1 deb
libgcrypt20 1.10.3-2build1 deb liblzma5 5.6.1+really5.4.5-1 deb
libgirepository-1.0-1 1.80.1-1 deb libmd0 1.1.0-2build1 deb
libglib2.0-0t64 2.80.0-6ubuntu1 deb libmount1 2.39.3-9ubuntu6 deb
libglib2.0-data 2.80.0-6ubuntu1 deb libncursesw6 6.4+20240113-1ubuntu2 deb
libgmp10 2:6.3.0+dfsg-2ubuntu6 deb libnettle8t64 3.9.1-2.2build1 deb
libgnutls30t64 3.8.3-1.1ubuntu3 deb libnghttp2-14 1.59.0-1ubuntu0.1 deb
libgpg-error0 1.47-3build2 deb libnpth0t64 1.6-3.1build1 deb
libgssapi-krb5-2 1.20.1-6ubuntu2 deb libonig5 6.9.9-1build1 deb
libhogweed6t64 3.9.1-2.2build1 deb libp11-kit0 0.25.3-4ubuntu2 deb
libicu74 74.2-1ubuntu3 deb libpam-modules 1.5.3-5ubuntu5 deb
libidn2-0 2.3.7-2build1 deb libpam-modules-bin 1.5.3-5ubuntu5 deb
libjq1 1.7.1-3build1 deb libpam-runtime 1.5.3-5ubuntu5 deb
libjson-c5 0.17-1build1 deb libpam0g 1.5.3-5ubuntu5 deb
libk5crypto3 1.20.1-6ubuntu2 deb libpcre2-8-0 10.42-4ubuntu2 deb
libkeyutils1 1.6.3-3build1 deb libproc2-0 2:4.0.4-4ubuntu3 deb
libkmod2 31+20240202-2ubuntu7 deb libpsl5t64 0.21.2-1.1build1 deb
libkrb5-3 1.20.1-6ubuntu2 deb libreadline8t64 8.2-4build1 deb
libkrb5support0 1.20.1-6ubuntu2 deb librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb
libksba8 1.6.6-1build1 deb libsasl2-2 2.1.28+dfsg1-5ubuntu3 deb
libldap-common 2.6.7+dfsg-1~exp1ubuntu8 deb libsasl2-modules 2.1.28+dfsg1-5ubuntu3 deb
libldap2 2.6.7+dfsg-1~exp1ubuntu8 deb libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3 deb
liblz4-1 1.9.4-1build1 deb libseccomp2 2.5.5-1ubuntu3 deb
liblzma5 5.6.1+really5.4.5-1 deb libselinux1 3.5-2ubuntu2 deb
libmd0 1.1.0-2build1 deb libsemanage-common 3.5-1build5 deb
libmount1 2.39.3-9ubuntu6 deb libsemanage2 3.5-1build5 deb
libncursesw6 6.4+20240113-1ubuntu2 deb libsepol2 3.5-2build1 deb
libnettle8t64 3.9.1-2.2build1 deb libsmartcols1 2.39.3-9ubuntu6 deb
libnghttp2-14 1.59.0-1build4 deb libsqlite3-0 3.45.1-1ubuntu2 deb
libnpth0t64 1.6-3.1build1 deb libss2 1.47.0-2.4~exp1ubuntu4 deb
libonig5 6.9.9-1build1 deb libssh-4 0.10.6-2build2 deb
libp11-kit0 0.25.3-4ubuntu2 deb libssl3t64 3.0.13-0ubuntu3.1 deb
libpam-modules 1.5.3-5ubuntu5 deb libstdc++6 14-20240412-0ubuntu1 deb
libpam-modules-bin 1.5.3-5ubuntu5 deb libsystemd0 255.4-1ubuntu8 deb
libpam-runtime 1.5.3-5ubuntu5 deb libtasn1-6 4.19.0-3build1 deb
libpam0g 1.5.3-5ubuntu5 deb libtinfo6 6.4+20240113-1ubuntu2 deb
libpcre2-8-0 10.42-4ubuntu2 deb libudev1 255.4-1ubuntu8 deb
libproc2-0 2:4.0.4-4ubuntu3 deb libunistring5 1.1-2build1 deb
libpsl5t64 0.21.2-1.1build1 deb libuuid1 2.39.3-9ubuntu6 deb
libpython3-stdlib 3.12.3-0ubuntu1 deb libxxhash0 0.8.2-2build1 deb
libpython3.12-minimal 3.12.3-1 deb libzstd1 1.5.5+dfsg2-2build1 deb
libpython3.12-stdlib 3.12.3-1 deb locales 2.39-0ubuntu8.1 deb
libreadline8t64 8.2-4build1 deb login 1:4.13+dfsg1-4ubuntu3 deb
librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb logsave 1.47.0-2.4~exp1ubuntu4 deb
libsasl2-2 2.1.28+dfsg1-5ubuntu3 deb mawk 1.3.4.20240123-1build1 deb
libsasl2-modules 2.1.28+dfsg1-5ubuntu3 deb mount 2.39.3-9ubuntu6 deb
libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3 deb ncurses-base 6.4+20240113-1ubuntu2 deb
libseccomp2 2.5.5-1ubuntu3 deb ncurses-bin 6.4+20240113-1ubuntu2 deb
libselinux1 3.5-2ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb
libsemanage-common 3.5-1build5 deb openssl 3.0.13-0ubuntu3.1 deb
libsemanage2 3.5-1build5 deb passwd 1:4.13+dfsg1-4ubuntu3 deb
libsepol2 3.5-2build1 deb perl-base 5.38.2-3.2build2 deb
libsmartcols1 2.39.3-9ubuntu6 deb pinentry-curses 1.2.1-3ubuntu5 deb
libsqlite3-0 3.45.1-1ubuntu2 deb procps 2:4.0.4-4ubuntu3 deb
libss2 1.47.0-2.4~exp1ubuntu4 deb publicsuffix 20231001.0357-0.1 deb
libssh-4 0.10.6-2build2 deb readline-common 8.2-4build1 deb
libssl3t64 3.0.13-0ubuntu3 deb sed 4.9-2build1 deb
libstdc++6 14-20240412-0ubuntu1 deb sensible-utils 0.0.22 deb
libsystemd-shared 255.4-1ubuntu8 deb systemd-standalone-sysusers 255.4-1ubuntu8 deb
libsystemd0 255.4-1ubuntu8 deb sysvinit-utils 3.08-6ubuntu3 deb
libtasn1-6 4.19.0-3build1 deb tar 1.35+dfsg-3build1 deb
libtinfo6 6.4+20240113-1ubuntu2 deb tzdata 2024a-2ubuntu1 deb
libudev1 255.4-1ubuntu8 deb ubuntu-keyring 2023.11.28.1 deb
libunistring5 1.1-2build1 deb util-linux 2.39.3-9ubuntu6 deb
libuuid1 2.39.3-9ubuntu6 deb zlib1g 1:1.3.dfsg-3.1ubuntu2 deb
libxml2 2.9.14+dfsg-1.3ubuntu3 deb
libxxhash0 0.8.2-2build1 deb
libzstd1 1.5.5+dfsg2-2build1 deb
locales 2.39-0ubuntu8 deb
login 1:4.13+dfsg1-4ubuntu3 deb
logsave 1.47.0-2.4~exp1ubuntu4 deb
mawk 1.3.4.20240123-1build1 deb
media-types 10.1.0 deb
mount 2.39.3-9ubuntu6 deb
ncurses-base 6.4+20240113-1ubuntu2 deb
ncurses-bin 6.4+20240113-1ubuntu2 deb
netbase 6.4 deb
netcat-openbsd 1.226-1ubuntu2 deb
networkd-dispatcher 2.2.4-1 deb
openssl 3.0.13-0ubuntu3 deb
passwd 1:4.13+dfsg1-4ubuntu3 deb
perl-base 5.38.2-3.2build2 deb
pinentry-curses 1.2.1-3ubuntu5 deb
procps 2:4.0.4-4ubuntu3 deb
publicsuffix 20231001.0357-0.1 deb
python3 3.12.3-0ubuntu1 deb
python3-dbus 1.3.2-5build3 deb
python3-gi 3.48.2-1 deb
python3-minimal 3.12.3-0ubuntu1 deb
python3.12 3.12.3-1 deb
python3.12-minimal 3.12.3-1 deb
readline-common 8.2-4build1 deb
sed 4.9-2build1 deb
sensible-utils 0.0.22 deb
shared-mime-info 2.4-4 deb
systemd 255.4-1ubuntu8 deb
systemd-dev 255.4-1ubuntu8 deb
systemd-resolved 255.4-1ubuntu8 deb
systemd-timesyncd 255.4-1ubuntu8 deb
sysvinit-utils 3.08-6ubuntu3 deb
tar 1.35+dfsg-3build1 deb
tzdata 2024a-2ubuntu1 deb
ubuntu-keyring 2023.11.28.1 deb
util-linux 2.39.3-9ubuntu6 deb
xdg-user-dirs 0.18-1build1 deb
zlib1g 1:1.3.dfsg-3.1ubuntu2 deb