Merge remote-tracking branch 'origin/refs/pull/344/head' into staging

Also, merge from upstream/staging

MAINTAINERS

@@ -35,6 +35,19 @@ matrix = "@dgrove:matrix.org"
 keyoxide = "https://keyoxide.org/C92FE5A3FBD58DD3EC5AA26BB10116B8193F2DBD"
 website = "https://dannygrove.com"
 
+[people.avrukin]
+name = "Michael Avrukin"
+location = "New York, USA"
+email = "michael@turnkey.io"
+website = "https://www.linkedin.com/in/mavrukin/"
+
+[people.shaneengelman]
+name = "Shane Engelman"
+location = "https://blog.runninginthenight.com/pwd/"
+email = "contact@shane.gg"
+matrix = "@singlerider:matrix.org"
+keyoxide = "https://keyoxide.org/3D7C8D39E8C4DF771583D3F0A8A091FD346001CA"
+
 [keys]
 
 [keys.lancevick.personal]
@@ -73,6 +86,24 @@ offline-ca = true
 backup = true
 interaction = true
 
+[keys.avrukin.turnkey]
+id = "FA0FA2E96BC2EABF6F85F01CA2D1BD3B8539D8E2"
+algorithm = "RSA4096"
+servers = "openpgp.org"
+devices = "Yubikey 5c Nano"
+offline-ca = true
+backup = true
+interaction = true
+
+[keys.shaneengelman.personal]
+id = "3D7C8D39E8C4DF771583D3F0A8A091FD346001CA"
+algorithm = "RSA4096"
+servers = "openpgp.org"
+devices = "Yubikey 5 NFC, Yubikey 5C Nano, flexSecure Java Card Implant"
+offline-ca = false
+backup = true
+interaction = true
+
 [machines]
 
 [machines.lancevick.local1]
@@ -158,3 +189,28 @@ ghz = 3.3
 cores = 8
 os = "arch Linux"
 runtime = "Docker"
+
+[machines.avrukin.gcp1]
+owner = "Michael Avrukin (Turnkey)"
+location = "us-central1-c"
+type = "vm"
+arch = "x86_64"
+brand = "Intel"
+model = "Intel Xeon Platinum 8260"
+ghz = 2.8
+cores = 48
+os = "debian linux"
+runtime = "Docker"
+
+[machines.shaneengelman.local]
+owner = "Shane Engelman"
+location = "https://blog.runninginthenight.com/pwd/"
+type = "metal"
+arch = "x86/64"
+brand = "AMD"
+model = "AMD Ryzen 5 7640U"
+ghz = "4.971"
+cores = 12
+os = "Arch Linux"
+runtime = "Docker"
+

README.md

@@ -24,12 +24,12 @@ For a full list of images see the "packages" directory.
 
 Get a shell in our x86_64 Stage3 bootstrap image:
 
-```sh
+```shell
 docker run -it stagex/stage3
 ```
 
 Run a Python hello world:
-```sh
+```shell
 docker run -i stagex/python -c "print('hello world')"
 ```
 
@@ -259,6 +259,7 @@ For further reading see the [Bootstrappable Builds](https://bootstrappable.org/)
 
 * An OCI building runtime
     * Currently Docker supported (v25+)
+        * [`containerd` support](https://docs.docker.com/engine/storage/containerd/#enable-containerd-image-store-on-docker-engine) is required
     * Support for buildah and podman coming soon
 	
 * Gnu Make
@@ -267,25 +268,27 @@ For further reading see the [Bootstrappable Builds](https://bootstrappable.org/)
 
 #### Reproduce entire tree
 
-```sh
+```shell
 make
 ```
 
 #### Compile specific package
 
-```sh
+```shell
 make rust
 ```
 
 #### Compile specific package without cache
 
-```sh
+```shell
 make NOCACHE=1
 ```
 
 #### Sign all locally built packages (WIP)
 
-```sh
+Do this after successfully reproducing all packages and stages:
+
+```shell
 make sign
 ```
 

packages/autoconf-archive/Containerfile

@@ -9,8 +9,6 @@ ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
 
 FROM fetch AS build
 COPY --from=stagex/busybox . /
-#COPY --from=stagex/gcc . /
-#COPY --from=stagex/binutils . /
 COPY --from=stagex/make . /
 COPY --from=stagex/musl . /
 RUN tar -xf ${SRC_FILE}

packages/autoconf/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.71
-ENV SRC_HASH=f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4
+ENV VERSION=2.72
+ENV SRC_HASH=ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a
 ENV SRC_FILE=autoconf-${VERSION}.tar.xz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/autoconf/${SRC_FILE}
 

packages/bash/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=5.2.21
-ENV SRC_HASH=c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
+ENV VERSION=5.2.37
+ENV SRC_HASH=9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff
 ENV SRC_FILE=bash-${VERSION}.tar.gz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/bash/${SRC_FILE}
 

packages/c-ares/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.33.1
-ENV SRC_HASH=06869824094745872fa26efd4c48e622b9bd82a89ef0ce693dc682a23604f415
+ENV VERSION=1.34.2
+ENV SRC_HASH=35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a
 ENV SRC_FILE=c-ares-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/c-ares/c-ares/releases/download/v${VERSION}/${SRC_FILE}
 

packages/ccid/Containerfile

@@ -20,7 +20,7 @@ COPY --from=stagex/flex . /
 COPY --from=stagex/pkgconf . /
 COPY --from=stagex/libusb . /
 COPY --from=stagex/zlib . /
-RUN tar -xvf $SRC_FILE
+RUN tar -xf $SRC_FILE
 WORKDIR /ccid-${VERSION}
 RUN --network=none <<-EOF
 	set -eux

packages/containerd/Containerfile

@@ -1,9 +1,9 @@
 FROM scratch AS base
-ENV VERSION=1.7.20
+ENV VERSION=1.7.22
 ENV COMMIT=8fc6bcff51318944179630522a095cc9dbf9f353
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/containerd/containerd/archive/${SRC_FILE}
-ENV SRC_HASH=c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6
+ENV SRC_HASH=8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/cython/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=3.0.10
-ENV SRC_HASH=00f97476cef9fcd9a89f9d2a49be3b518e1a74b91f377fe08c97fcb44bc0f7d7
+ENV VERSION=3.0.11-1
+ENV SRC_HASH=a6bcfc81ae0487c3d0de4226e0c5aff7c7d0a5e344cc7b75c17bbb6e713f154b
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/cython/cython/archive/${SRC_FILE}
 

packages/dhcpcd/Containerfile

@@ -1,8 +1,8 @@
 FROM scratch AS base
-ENV VERSION=10.0.10
+ENV VERSION=10.1.0
 ENV SRC_FILE=dhcpcd-${VERSION}.tar.xz
 ENV SRC_SITE=https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${VERSION}/${SRC_FILE}
-ENV SRC_HASH=d582012992efddd2442bb1213c518a37d90febbcf8b11f8e76448c710dacad27
+ENV SRC_HASH=abc307c63853da3199baa5c1e15fd5ede9d68d068b2a59ca14c5a6768e9cc3b7
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/dtc/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.7.0
-ENV SRC_HASH=29edce3d302a15563d8663198bbc398c5a0554765c83830d0d4c0409d21a16c4
+ENV VERSION=1.7.1
+ENV SRC_HASH=398098bac205022b39d3dce5982b98c57f1023f3721a53ebcbb782be4cf7885e
 ENV SRC_FILE=dtc-${VERSION}.tar.xz
 ENV SRC_SITE=https://kernel.org/pub/software/utils/dtc/${SRC_FILE}
 

packages/e2fsprogs/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=1.47.0
-ENV SRC_HASH=74c8ea97c73294edc6c11dc5e7fbb4324f86c28efd66ad0ba50be4eec8a48be2
+ENV VERSION=1.47.1
+ENV SRC_HASH=db95ff1cb6ef741c9aa8875d9f3f52a34168360febba765b6377b80bada09a8c
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/tytso/e2fsprogs/archive/${SRC_FILE}
 

packages/fmt/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=10.2.1
-ENV SRC_HASH=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
+ENV VERSION=11.0.2
+ENV SRC_HASH=6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/fmtlib/fmt/archive/refs/tags/${SRC_FILE}
 

packages/freetds/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=1.4.22
-ENV SRC_HASH=a9a7f24f0a7a871617e76e8cc6e6556ae788042f1c006195665505499b2334b1
+ENV VERSION=1.4.23
+ENV SRC_HASH=93a3f186b82c6042a66a1970bd478d7914edb1c5669b642d80b4eaacf2a2d17e
 ENV SRC_FILE=freetds-${VERSION}.tar.bz2
 ENV SRC_SITE=https://www.freetds.org/files/stable/${SRC_FILE}
 

packages/fuse-overlayfs/Containerfile

@@ -1,8 +1,8 @@
 FROM scratch AS base
-ENV VERSION=1.13
+ENV VERSION=1.14
 ENV SRC_FILE=fuse-overlayfs-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/containers/fuse-overlayfs/archive/v${VERSION}/${SRC_FILE}
-ENV SRC_HASH=96d10344921d5796bcba7a38580ae14a53c4e60399bb90b238ac5a10b3bb65b2
+ENV SRC_HASH=0779d1ee8fbb6adb48df40e54efa9c608e1d7bbd844800a4c32c110d5fcbe9f2
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/gen_initramfs/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=6.8
-ENV SRC_HASH=c969dea4e8bb6be991bbf7c010ba0e0a5643a3a8d8fb0a2aaa053406f1e965f3
+ENV VERSION=6.11.2
+ENV SRC_HASH=ec9ef7a0b9cebb55940e1ef87a1f9e1004b10456a119dc386bb3e565b0d39c42
 ENV SRC_FILE=linux-${VERSION}.tar.xz
 ENV SRC_SITE=http://mirrors.edge.kernel.org/pub/linux/kernel/v6.x/${SRC_FILE}
 

packages/gettext/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=0.21
-ENV SRC_HASH=d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
+ENV VERSION=0.22.5
+ENV SRC_HASH=fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640
 ENV SRC_FILE=gettext-${VERSION}.tar.xz
 ENV SRC_SITE=https://mirrors.kernel.org/gnu/gettext/${SRC_FILE}
 

packages/glib/Containerfile

@@ -1,9 +1,9 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=2.80.0
-ENV SRC_HASH=8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
+ENV VERSION=2.82.1
+ENV SRC_HASH=478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6
 ENV SRC_FILE=glib-${VERSION}.tar.xz
-ENV SRC_SITE=https://download.gnome.org/sources/glib/2.80/${SRC_FILE}
+ENV SRC_SITE=https://download.gnome.org/sources/glib/${VERSION%.*}/${SRC_FILE}
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}

packages/go-md2man/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.0.3
-ENV SRC_HASH=7ca3a04bb4ab83387538235decc42a535097a05d2fb9f2266d0c47b33119501f
+ENV VERSION=2.0.5
+ENV SRC_HASH=6bb799e8fff06d82ca4617190157338d336e2361aa6c5b1786f763a684ffc3f2
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/cpuguy83/go-md2man/archive/${SRC_FILE}
 

packages/gpg/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.4.4
-ENV SRC_HASH=67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6
+ENV VERSION=2.5.1
+ENV SRC_HASH=8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e
 ENV SRC_FILE=gnupg-${VERSION}.tar.bz2
 ENV SRC_SITE=https://gnupg.org/ftp/gcrypt/gnupg/${SRC_FILE}
 
@@ -18,7 +18,7 @@ COPY --from=stagex/libksba . /
 COPY --from=stagex/libgpg-error . /
 COPY --from=stagex/libassuan . /
 COPY --from=stagex/libgcrypt . /
-RUN tar -xvf $SRC_FILE
+RUN tar -xf $SRC_FILE
 WORKDIR /gnupg-${VERSION}
 RUN --network=none <<-EOF
 	set -eux

packages/helm/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=3.14.3
-ENV SRC_HASH=e0d46f69954002d27eaac3bd6543ee4f486cdd3795c5aac921e7f02791df8d8e
+ENV VERSION=3.16.1
+ENV SRC_HASH=2d6d99eff0f1667578ec2481aed259c8fe19d5c91f680e78e80fe903c55280ee
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/helm/helm/archive/refs/tags/${SRC_FILE}
 ENV GOPATH=/cache/go

packages/libassuan/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.5.6
-ENV SRC_HASH=e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
+ENV VERSION=3.0.1
+ENV SRC_HASH=c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1
 ENV SRC_FILE=libassuan-${VERSION}.tar.bz2
 ENV SRC_SITE=https://gnupg.org/ftp/gcrypt/libassuan/${SRC_FILE}
 

packages/libcap/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.69
-ENV SRC_HASH=9cc2fa3ee744d881629cdac1a1b54c302e7684fda3e3622056218c7681642ffb
+ENV VERSION=2.70
+ENV SRC_HASH=18f00ea97c7541af86379dec9d4d8ea838aac4a1f70177d81d91657e4e43b808
 ENV SRC_FILE=libcap-${VERSION}.tar.gz
 ENV SRC_SITE=https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/${SRC_FILE}
 

packages/libdeflate/Containerfile

@@ -0,0 +1,42 @@
+FROM scratch AS base
+ARG ARCH=x86_64
+ENV VERSION=1.20
+ENV PACKAGE_NAME=libdeflate
+ENV SRC_HASH=ed1454166ced78913ff3809870a4005b7170a6fd30767dc478a09b96847b9c2a
+ENV SRC_FILE=v${VERSION}.tar.gz
+ENV SRC_SITE=https://github.com/ebiggers/libdeflate/archive/refs/tags/${SRC_FILE}
+
+FROM base AS fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch AS build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/make . /
+COPY --from=stagex/cmake . /
+COPY --from=stagex/openssl . /
+COPY --from=stagex/libgcrypt . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/samurai . /
+COPY --from=stagex/zlib . / 
+RUN tar -xf ${SRC_FILE}
+RUN ln -sf /bin/gas /bin/as
+WORKDIR /${PACKAGE_NAME}-${VERSION}
+RUN --network=none <<-EOF
+	set -eux; \
+    cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DLIBDEFLATE_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLIBDEFLATE_BUILD_SHARED_LIB=OFF \
+		-DLIBDEFLATE_USE_SHARED_LIB=OFF
+	cmake --build build
+EOF
+
+FROM build AS install
+RUN --network=none DESTDIR="/rootfs" cmake --install build
+RUN find /rootfs -exec touch -hcd "@0" "{}" +
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /

packages/libedit/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=20230828-3.1
-ENV SRC_HASH=4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad
+ENV VERSION=20240808-3.1
+ENV SRC_HASH=5f0573349d77c4a48967191cdd6634dd7aa5f6398c6a57fe037cc02696d6099f
 ENV SRC_FILE=libedit-${VERSION}.tar.gz
 ENV SRC_SITE=https://www.thrysoee.dk/editline/${SRC_FILE}
 

packages/libgcrypt/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.10.3
-ENV SRC_HASH=8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa
+ENV VERSION=1.11.0
+ENV SRC_HASH=09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c
 ENV SRC_FILE=libgcrypt-${VERSION}.tar.bz2
 ENV SRC_SITE=https://gnupg.org/ftp/gcrypt/libgcrypt/${SRC_FILE}
 

packages/libgpg-error/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.47
-ENV SRC_HASH=9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
+ENV VERSION=1.50
+ENV SRC_HASH=69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a
 ENV SRC_FILE=libgpg-error-${VERSION}.tar.bz2
 ENV SRC_SITE=https://gnupg.org/ftp/gcrypt/libgpg-error/${SRC_FILE}
 

packages/libnftnl/Containerfile

@@ -1,8 +1,8 @@
 FROM scratch AS base
-ENV VERSION=1.2.7
+ENV VERSION=1.2.8
 ENV SRC_FILE=libnftnl-${VERSION}.tar.xz
 ENV SRC_SITE=https://netfilter.org/projects/libnftnl/files/${SRC_FILE}
-ENV SRC_HASH=9122774f968093d5c0bacddd67de480f31fa4073405a7fc058a34b0f387aecb3
+ENV SRC_HASH=37fea5d6b5c9b08de7920d298de3cdc942e7ae64b1a3e8b880b2d390ae67ad95
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/linux-server/Containerfile

@@ -0,0 +1,58 @@
+FROM scratch AS base
+ENV VERSION=6.10.7
+ENV SRC_HASH=900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9
+ENV SRC_FILE=linux-${VERSION}.tar.xz
+ENV SRC_SITE=http://mirrors.edge.kernel.org/pub/linux/kernel/v6.x/${SRC_FILE}
+
+FROM base AS fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch AS build
+COPY --from=stagex/musl . /
+COPY --from=stagex/make . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/linux-headers . /
+COPY --from=stagex/elfutils . /
+COPY --from=stagex/openssl . /
+COPY --from=stagex/perl . /
+COPY --from=stagex/m4 . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/bison . /
+COPY --from=stagex/libzstd . /
+COPY --from=stagex/zlib . /
+COPY --from=stagex/flex . /
+COPY --from=stagex/pkgconf . /
+COPY --from=stagex/coreutils . /
+COPY --from=stagex/findutils . /
+COPY --from=stagex/diffutils . /
+COPY --from=stagex/tar . /
+COPY --from=stagex/gzip . /
+COPY --from=stagex/xz . /
+COPY --from=stagex/sed . /
+COPY --from=stagex/grep . /
+COPY --from=stagex/gawk . /
+COPY --from=stagex/bc . /
+COPY --from=stagex/bash . /
+COPY --from=stagex/bash /bin/bash /bin/sh
+RUN tar -xf ${SRC_FILE}
+WORKDIR /linux-${VERSION}
+ADD linux.config .config
+ENV SOURCE_DATE_EPOCH=1
+ENV KBUILD_BUILD_HOST=stagex
+ENV KBUILD_BUILD_USER=user
+ENV KBUILD_BUILD_TIMESTAMP="Thu Jan  1 12:00:00 AM GMT 1970"
+RUN <<-EOF
+	set -eux
+	make -j "$(nproc)" bzImage
+EOF
+
+FROM build AS install
+RUN <<-EOF
+	set -eux
+    mkdir /rootfs
+	cp .config /rootfs/linux.config
+	cp arch/x86_64/boot/bzImage /rootfs
+EOF
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /

packages/lzip/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=1.24
-ENV SRC_HASH=d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c
+ENV VERSION=1.24.1
+ENV SRC_HASH=30c9cb6a0605f479c496c376eb629a48b0a1696d167e3c1e090c5defa481b162
 ENV SRC_FILE=lzip-${VERSION}.tar.gz
 ENV SRC_SITE=http://download.savannah.gnu.org/releases/lzip/${SRC_FILE}
 

packages/mtools/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=4.0.43
-ENV SRC_HASH=541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339
+ENV VERSION=4.0.45
+ENV SRC_HASH=0b008a96bd0efe0e542fa4383d469af66bc4a93394990b103730a8160a67d618
 ENV SRC_FILE=mtools-${VERSION}.tar.bz2
 ENV SRC_SITE=https://ftp.gnu.org/gnu/mtools/${SRC_FILE}
 

packages/ncurses/Containerfile

@@ -1,9 +1,9 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=6.4-20240309
-ENV SRC_HASH=ff909c46f219c4a4756da5f2e9f1925704560718765282aae73841f6cce021d5
-ENV SRC_FILE=ncurses-${VERSION}.tgz
-ENV SRC_SITE=https://invisible-mirror.net/archives/ncurses/current/${SRC_FILE}
+ENV VERSION=6.5
+ENV SRC_HASH=136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6
+ENV SRC_FILE=ncurses-${VERSION}.tar.gz
+ENV SRC_SITE=https://ftp.gnu.org/gnu/ncurses/${SRC_FILE}
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/nodejs/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=22.7.0
-ENV SRC_HASH=7a7c99282d59866d971b2da12c99596cb15782b9c3efe2e2146390c14f4d490e
+ENV VERSION=22.9.0
+ENV SRC_HASH=296854aa1dca140b0462c2415637d0419e42af91114538a7e6fdf623971a6833
 ENV SRC_FILE=node-v${VERSION}.tar.gz
 ENV SRC_SITE=https://nodejs.org/dist/v${VERSION}/${SRC_FILE}
 

packages/npm/Containerfile

@@ -0,0 +1,67 @@
+FROM scratch AS base
+ENV VERSION=10.8.3
+ENV SRC_HASH=b7dc7eb48d7479b93668e913c7ad686ab2aa71c705d4a56b5323d1bffdba2972
+ENV SRC_FILE=npm-${VERSION}.tgz
+ENV SRC_SITE=https://registry.npmjs.org/npm/-/${SRC_FILE}
+
+FROM base AS fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch AS build
+COPY --from=stagex/musl . /
+COPY --from=stagex/busybox . /
+RUN tar -xf ${SRC_FILE}
+WORKDIR /package
+ADD *.patch .
+
+FROM build AS install
+ENV DESTDIR=/rootfs
+RUN --network=none <<-EOF
+	patch -p1 < dont-check-for-last-version.patch 
+	rm bin/npm bin/npx bin/*.cmd
+	rm README.md
+	rm -rf docs
+
+	cd node_modules
+	find . -type f \( \
+		-name '.*' -o \
+		-name '*.cmd' -o \
+		-name '*.bat' -o \
+		-name '*.map' -o \
+		-name '*.md' -o \
+		\( -name '*.ts' -a ! -name '*.d.ts' \) -o \
+		-name 'AUTHORS*' -o \
+		-name 'LICENSE*' -o \
+		-name 'license' -o \
+		-name 'Makefile' -o \
+		-name 'README*' -o \
+		-name 'readme.markdown' \) -delete
+	rm -rf ./*/.git* ./*/doc ./*/docs ./*/examples ./*/scripts ./*/test
+	rm -rf ./node-gyp/gyp/.git*
+
+	# No files should be executable here, except node-gyp.
+	find . -type f -executable ! -name 'node-gyp*' -exec chmod -x {} \;
+
+	cd /package
+	destdir="usr/lib/node_modules/npm"
+
+	mkdir -p $DESTDIR/$destdir
+	cp -R ./* $DESTDIR/$destdir
+
+	cd $DESTDIR
+	mkdir -p usr/bin
+
+	ln -s ../lib/node_modules/npm/bin/npm-cli.js usr/bin/npm
+	ln -s ../lib/node_modules/npm/bin/npx-cli.js usr/bin/npx
+	ln -s ../lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js usr/bin/node-gyp
+
+	mkdir -p usr/share/licenses/npm
+	mv ${destdir}/LICENSE usr/share/licenses/npm/
+
+	install -D -m644 "$destdir"/lib/utils/completion.sh \
+	usr/share/bash-completion/completions/npm
+EOF
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /
+

packages/npm/dont-check-for-last-version.patch

@@ -0,0 +1,15 @@
+Don't check for last version
+
+Patch based on https://sources.debian.org/src/npm/7.5.2+ds-2/debian/patches/dont-check-for-last-version.patch
+
+--- a/lib/cli/update-notifier.js
++++ b/lib/cli/update-notifier.js
+@@ -76,6 +76,8 @@ const updateCheck = async (npm, spec, version, current) => {
+ }
+ 
+ const updateNotifier = async (npm, spec = 'latest') => {
++  // XXX-Patched: Maintained by Alpine's package manager
++  return null;
+   // if we're on a prerelease train, then updates are coming fast
+   // check for a new one daily.  otherwise, weekly.
+   const { version } = npm

packages/nuspell/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=5.1.4
-ENV SRC_HASH=bdf344c5adbcc6797940f8f8cb75cb59f5a3794eb21b9547751a11782a792ef7
+ENV VERSION=5.1.6
+ENV SRC_HASH=5d4baa1daf833a18dc06ae0af0571d9574cc849d47daff6b9ce11dac0a5ded6a
 ENV SRC_FILE=nuspell-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/nuspell/nuspell/archive/refs/tags/v${VERSION}.tar.gz
 

packages/openldap/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=2.5.17
-ENV SRC_HASH=d706a34b348ae38a9e3e4eb0d2cd5afeb939f2b2db95e6ae3d410d6a75e90e3c
+ENV VERSION=2.6.8
+ENV SRC_HASH=48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e
 ENV SRC_FILE=openldap-${VERSION}.tgz
 ENV SRC_SITE=https://www.openldap.org/software/download/OpenLDAP/openldap-release/${SRC_FILE}
 

packages/osv-scanner/Containerfile

@@ -1,8 +1,8 @@
 FROM scratch AS base
-ENV VERSION=1.6.1
+ENV VERSION=1.9.0
 ENV SRC_FILE=osv-scanner-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/google/osv-scanner/archive/v${VERSION}/${SRC_FILE}
-ENV SRC_HASH=ecaefa45c63057a8ebae9fcf9a0b760435c640157516cebfd44237664923ee13
+ENV SRC_HASH=85ce158b6dce22cddc19b652bdc5150145b57119e3acfa8e3ae5ba1cfa449a3f
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/pcre2/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=10.43
-ENV SRC_HASH=f0048e26b02bdfaf43b8cec75030a9c2fe28552bf5caa693d3ccbf4d886fa930
+ENV VERSION=10.44
+ENV SRC_HASH=07a002e8216382a96f722bc4a831f3d77457fe3e9e62a6dff250a2dd0e9c5e6d
 ENV SRC_FILE=pcre2-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/PCRE2Project/pcre2/archive/refs/tags/${SRC_FILE}
 

packages/postgresql13/Containerfile

@@ -0,0 +1,60 @@
+FROM scratch AS base
+ENV VERSION=13.16
+ENV SRC_HASH=33647543546202825bdf89bfb71523b5aea12b3b0153a689f694a08ed02aa204
+ENV SRC_FILE=postgresql-${VERSION}.tar.gz
+ENV SRC_SITE=https://ftp.postgresql.org/pub/source/v${VERSION}/${SRC_FILE}
+
+FROM base AS fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch AS build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/make . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/pkgconf . /
+COPY --from=stagex/icu . /
+COPY --from=stagex/llvm . /
+COPY --from=stagex/zlib . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/clang . /
+COPY --from=stagex/perl . /
+COPY --from=stagex/ncurses . /
+COPY --from=stagex/bison . /
+COPY --from=stagex/flex . /
+COPY --from=stagex/libxml2 . /
+COPY --from=stagex/python . /
+COPY --from=stagex/openssl . /
+COPY --from=stagex/readline . /
+COPY --from=stagex/util-linux . /
+COPY --from=stagex/linux-headers . /
+COPY --from=stagex/e2fsprogs . /
+COPY --from=stagex/tcl . /
+
+RUN tar -xf ${SRC_FILE}
+WORKDIR /postgresql-${VERSION}
+RUN --network=none <<-EOF
+    set -eux
+    ./configure \
+        --build=x86_64-linux-musl \
+        --host=x86_64-linux-musl \
+        --prefix=/usr \
+        --mandir=/usr/share/man \
+        --with-libxml \
+        --with-openssl \
+        --with-uuid=e2fs \
+        --disable-rpath \
+        --with-llvm \
+        --with-perl \
+        --with-python \
+        --with-icu \
+        --with-tcl \
+        --with-readline
+    make -j "$(nproc)" world
+EOF
+
+FROM build AS install
+RUN --network=none make install-world DESTDIR=/rootfs
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /

packages/protoc-gen-go-grpc/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.63.2
-ENV SRC_HASH=ffc7611e4989de79de4c17b015ff10db810b85f749b12520336314746e9d7095
+ENV VERSION=1.67.0
+ENV SRC_HASH=1d50c8df1935aae7d2c734a0ec1e9cead7552443af8a03852abd2244e0a7fb55
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/grpc/grpc-go/archive/refs/tags/${SRC_FILE}
 

packages/protoc-gen-grpc-gateway/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.19.1
-ENV SRC_HASH=89d78abbe4aca77ce7823223945e852aec31c87a8c7aac084340ef9f53fd9637
+ENV VERSION=2.22.0
+ENV SRC_HASH=509c86f389f4da5ac5ce06c6e2e85834070e4f774b4bb4c5c0536c464911ae25
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/grpc-ecosystem/grpc-gateway/archive/refs/tags/${SRC_FILE}
 

packages/protoc-gen-openapiv2/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.17.1
-ENV SRC_HASH=092bc95544d6089ccea00fb124a0a81eadf212bf06d61a4ba422ad331bf3c6da
+ENV VERSION=2.22.0
+ENV SRC_HASH=509c86f389f4da5ac5ce06c6e2e85834070e4f774b4bb4c5c0536c464911ae25
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/grpc-ecosystem/grpc-gateway/archive/refs/tags/${SRC_FILE}
 

packages/py-awscrt/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=0.20.3
-ENV SRC_HASH=c41e471c3494287606a2c6c26b8fe97acc74b8941aae9d9a121a470c19838758
+ENV VERSION=0.22.0
+ENV SRC_HASH=4ca2b0b49328f03f5a3dde2d565132df8ad74cba27352612ecd9fe2505e1d770
 ENV SRC_FILE=awscrt-${VERSION}.tar.gz
 ENV SRC_SITE=https://files.pythonhosted.org/packages/source/a/awscrt/${SRC_FILE}
 

packages/py-build/Containerfile

@@ -7,7 +7,7 @@ ENV SRC_SITE=https://files.pythonhosted.org/packages/source/b/build/${SRC_FILE}
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
 
-FROM fetch AS install
+FROM fetch AS build
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/python . /
@@ -15,8 +15,10 @@ COPY --from=stagex/py-setuptools . /
 COPY --from=stagex/zlib . /
 RUN tar -xzf ${SRC_FILE}
 WORKDIR /build-${VERSION}
+
+FROM build AS install
 RUN --network=none <<-EOF
-	set -eu
+    set -eu
     python setup.py install --root=/rootfs
     find /rootfs | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf
 EOF

packages/py-cparser/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.21
-ENV SRC_HASH=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+ENV VERSION=2.22
+ENV SRC_HASH=491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6
 ENV SRC_FILE=pycparser-${VERSION}.tar.gz
 ENV SRC_SITE=https://files.pythonhosted.org/packages/source/p/pycparser/${SRC_FILE}
 

packages/py-dateutil/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=2.9.0
-ENV SRC_HASH=78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709
+ENV VERSION=2.9.0.post0
+ENV SRC_HASH=37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3
 ENV SRC_FILE=python-dateutil-${VERSION}.tar.gz
 ENV SRC_SITE=https://files.pythonhosted.org/packages/source/p/python-dateutil/${SRC_FILE}
 

packages/py-gpep517/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=15
-ENV SRC_HASH=368fa8dfb0775589e3f85d34df18395c22980de8520dc6447e778fc1d0102787
+ENV VERSION=16
+ENV SRC_HASH=965ff7cb2217fa03091face01fcb9a2b0205f58be80c8be9ccf832eab7a55414
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/projg2/gpep517/archive/v${VERSION}/${SRC_FILE}
 

packages/py-libarchive/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
 ENV VERSION=5.1
-ENV SRC_HASH=b8198dd259684f75622112eb3172800780fbedda0a83652d22d36db0d4c0433c
+ENV SRC_HASH=5051c6d157d03cc0891e5f1051edf5122d6e9b82c58cd30e898dea818e7ff014
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/Changaco/python-libarchive-c/archive/${SRC_FILE}
 

packages/py-prompt_toolkit/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=3.0.43
-ENV SRC_HASH=3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d
+ENV VERSION=3.0.48
+ENV SRC_HASH=d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90
 ENV SRC_FILE=prompt_toolkit-${VERSION}.tar.gz
 ENV SRC_SITE=https://files.pythonhosted.org/packages/source/p/prompt_toolkit/${SRC_FILE}
 

packages/py-sphinx/Containerfile

@@ -1,7 +1,6 @@
 FROM scratch AS base
 ENV VERSION=7.2.6
 ENV SRC_HASH=b41c04543148937b887097f396d7b2b54ae49d0597b68625f06ffdf702d4d917
-
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/sphinx-doc/sphinx/archive/${SRC_FILE}
 

packages/py-sphinxcontrib-applehelp/Containerfile

@@ -1,8 +1,8 @@
 FROM scratch AS base
-ENV VERSION=1.0.4
-ENV SRC_HASH=828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e
-ENV SRC_FILE=sphinxcontrib-applehelp-${VERSION}.tar.gz
-ENV SRC_SITE=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/${SRC_FILE}
+ENV VERSION=2.0.0
+ENV SRC_HASH=2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1
+ENV SRC_FILE=sphinxcontrib_applehelp-${VERSION}.tar.gz
+ENV SRC_SITE=https://files.pythonhosted.org/packages/ba/6e/b837e84a1a704953c62ef8776d45c3e8d759876b4a84fe14eba2859106fe/${SRC_FILE}
 
 FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .

packages/seabios/Containerfile

@@ -15,7 +15,6 @@ COPY --from=stagex/make . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/python . /
 RUN tar -xf ${SRC_FILE}
-RUN ls -lah .
 WORKDIR /seabios-rel-${VERSION}
 ADD config.* .
 RUN --network=none <<-EOF

packages/socat/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=1.8.0.0
-ENV SRC_HASH=6010f4f311e5ebe0e63c77f78613d264253680006ac8979f52b0711a9a231e82
+ENV VERSION=1.8.0.1
+ENV SRC_HASH=dc350411e03da657269e529c4d49fe23ba7b4610b0b225c020df4cf9b46e6982
 ENV SRC_FILE=socat-${VERSION}.tar.gz
 ENV SRC_SITE=http://www.dest-unreach.org/socat/download/${SRC_FILE}
 

packages/ssh-tpm-agent/Containerfile

@@ -0,0 +1,35 @@
+FROM scratch AS base
+ENV VERSION=0.6.0
+ENV SRC_HASH=897cdd7a83162d6330ecc5da493bddf9ab59e25d6dbc5337eafbdf8856030fac
+ENV SRC_FILE=v${VERSION}.tar.gz
+ENV SRC_SITE=https://github.com/Foxboron/ssh-tpm-agent/archive/refs/tags/v${VERSION}.tar.gz
+
+FROM base AS fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch AS build
+COPY --from=stagex/binutils . /
+COPY --from=stagex/busybox . /
+COPY --from=stagex/ca-certificates . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/make . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/go . /
+RUN tar -xvf v${VERSION}.tar.gz
+WORKDIR /ssh-tpm-agent-${VERSION}
+ENV GOPROXY=https://proxy.golang.org,direct
+ENV GOSUMDB=sum.golang.org
+ENV GOPATH=/cache/go
+ENV GOBIN=${GOPATH}/bin
+ENV PATH=${GOBIN}:${PATH}
+RUN mkdir -p ${GOPATH}
+RUN go build -o bin/ssh-tpm-agent ./cmd/ssh-tpm-agent
+
+FROM build AS install
+RUN --network=none <<-EOF
+    mkdir -p /rootfs/usr/bin/
+    cp bin/ssh-tpm-agent /rootfs/usr/bin/
+EOF
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/./ /

packages/tflint/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=0.50.3
-ENV SRC_HASH=e90acdbf4cd1dc936e50b580ade53583baced53a93b3b01cee3e073b233ef8c5
+ENV VERSION=0.53.0
+ENV SRC_HASH=22dd4644dd249b38b8cbb29bd4ca66aefa65a2d9dc38109a3ca5b428a4ba755b
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/terraform-linters/tflint/archive/refs/tags/${SRC_FILE}
 ENV GOPATH=/cache/go

packages/util-macros/Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS base
 ARG ARCH=x86_64
-ENV VERSION=1.20.0
-ENV SRC_HASH=0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db
+ENV VERSION=1.20.1
+ENV SRC_HASH=0b308f62dce78ac0f4d9de6888234bf170f276b64ac7c96e99779bb4319bcef5
 ENV SRC_FILE=util-macros-${VERSION}.tar.xz
 ENV SRC_SITE=https://www.x.org/releases/individual/util/${SRC_FILE}
 

src/macros.mk

@@ -40,8 +40,13 @@ endef
 
 define dep-list
 	$(eval PACKAGE := $(1))
-	grep -Ri "^COPY --from=stagex/" packages/$(PACKAGE)/Containerfile \
-	| sed -e 's/COPY --from=stagex\/\([a-z0-9._-]\+\) .*/\1/g' \
+	grep -Ri \
+		-e "^COPY --from=stagex/"
+		-e "FROM stagex/.* AS package" \
+		packages/$(PACKAGE)/Containerfile \
+	| sed \
+		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \
+		-e 's/FROM stagex\/\([^ ]\+\).*/\1/g'
 	| uniq \
 	| while IFS= read -r package; \
 		do \
@@ -61,8 +66,13 @@ endef
 
 define build-context-args
 	$(eval PACKAGE := $(1))
-	grep -Ri "^COPY --from=stagex/" packages/$(PACKAGE)/Containerfile \
-	| sed -e 's/COPY --from=stagex\/\([a-z0-9._-]\+\) .*/\1/g' \
+	grep -Ri \
+		-e "^COPY --from=stagex/"
+		-e "FROM stagex/.* AS package" \
+		packages/$(PACKAGE)/Containerfile \
+	| sed \
+		-e 's/COPY --from=stagex\/\([^ ]\+\) .*/\1/g' \
+		-e 's/FROM stagex\/\([^ ]\+\).*/\1/g'
 	| uniq \
 	| while IFS= read -r package; do \
 		if [ "$$package" = "$(PACKAGE)" ]; then