diff options
| author |   Sam James <sam@gentoo.org> | 2023-10-09 06:30:02 +0100 |
|---|---|---|
| committer |   John Helmert III <ajak@gentoo.org> | 2023-10-14 10:34:55 -0700 |
| commit | 829b55c1c8263f277c7deb6c536f466df2c20817 (patch) | |
| tree | 57679f77c4980baed485a6a90e8dea214ba16a40 | |
| parent | actions: move portage to its own daily job (diff) | |
| download | docker-images-829b55c1c8263f277c7deb6c536f466df2c20817.tar.gz docker-images-829b55c1c8263f277c7deb6c536f466df2c20817.tar.bz2 docker-images-829b55c1c8263f277c7deb6c536f466df2c20817.zip | |
Handle new clearsigned 'latest' files
The latest*.txt files are now clear-signed which confuses our awk line.
Signed-off-by: Sam James <sam@gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/132
Signed-off-by: John Helmert III <ajak@gentoo.org>
| -rw-r--r-- | stage3.Dockerfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/stage3.Dockerfile b/stage3.Dockerfile index df82bc2..111ae96 100644 --- a/stage3.Dockerfile +++ b/stage3.Dockerfile @@ -16,14 +16,16 @@ ARG SIGNING_KEY="0xBB572E0E2D182910" RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}" \ && apk --no-cache add ca-certificates gnupg tar wget xz \ - && STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \ - && echo "STAGE3PATH:" $STAGE3PATH \ - && STAGE3="$(basename ${STAGE3PATH})" \ - && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \ && gpg --list-keys \ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \ && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \ + && wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" \ + && gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt" \ + && STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut -f 1 -d ' ')" \ + && echo "STAGE3PATH:" ${STAGE3PATH} \ + && STAGE3="$(basename ${STAGE3PATH})" \ + && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \ && gpg --verify "${STAGE3}.asc" \ && tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \ && ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \ |