From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 824B9158089 for ; Sat, 14 Oct 2023 17:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C99272BC01F; Sat, 14 Oct 2023 17:35:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1E682BC01F for ; Sat, 14 Oct 2023 17:35:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B62E335C31 for ; Sat, 14 Oct 2023 17:35:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BB0E1142 for ; Sat, 14 Oct 2023 17:35:12 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1697304895.829b55c1c8263f277c7deb6c536f466df2c20817.ajak@gentoo> Subject: [gentoo-commits] proj/docker-images:master commit in: / X-VCS-Repository: proj/docker-images X-VCS-Files: stage3.Dockerfile X-VCS-Directories: / X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 829b55c1c8263f277c7deb6c536f466df2c20817 X-VCS-Branch: master Date: Sat, 14 Oct 2023 17:35:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b97ddf9-495e-46ad-8146-0220aa9f2e49 X-Archives-Hash: 061e978873de8d46d2790375e6cebc4f commit: 829b55c1c8263f277c7deb6c536f466df2c20817 Author: Sam James gentoo org> AuthorDate: Mon Oct 9 05:30:02 2023 +0000 Commit: John Helmert III gentoo org> CommitDate: Sat Oct 14 17:34:55 2023 +0000 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=829b55c1 Handle new clearsigned 'latest' files The latest*.txt files are now clear-signed which confuses our awk line. Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo-docker-images/pull/132 Signed-off-by: John Helmert III gentoo.org> stage3.Dockerfile | 10 ++++++---- 1 file 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 ) \