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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4CCE415808B for ; Fri, 18 Feb 2022 17:39:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41FF0E0827; Fri, 18 Feb 2022 17:39:18 +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 233A4E0825 for ; Fri, 18 Feb 2022 17:39:18 +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 D4DA83433BC for ; Fri, 18 Feb 2022 17:39:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 076062DD for ; Fri, 18 Feb 2022 17:39:15 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1645205949.7aea4fa952454731779696bda1fdd3d605b8f07b.ultrabug@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: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: 7aea4fa952454731779696bda1fdd3d605b8f07b X-VCS-Branch: master Date: Fri, 18 Feb 2022 17:39:15 +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: cbb774f6-b750-496d-8121-a77871c24e0e X-Archives-Hash: 13bf41a4930db7fa3954d54dbe148cc7 commit: 7aea4fa952454731779696bda1fdd3d605b8f07b Author: Sam James gentoo org> AuthorDate: Tue Feb 15 03:03:07 2022 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Fri Feb 18 17:39:09 2022 +0000 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7aea4fa9 Update for new .asc layout Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo-docker-images/pull/117 Signed-off-by: Alexys Jacob gentoo.org> stage3.Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stage3.Dockerfile b/stage3.Dockerfile index b9909ee..df82bc2 100644 --- a/stage3.Dockerfile +++ b/stage3.Dockerfile @@ -19,17 +19,16 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${ && 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}.DIGESTS.asc" \ + && 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} \ - && gpg --verify "${STAGE3}.DIGESTS.asc" \ - && awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \ + && 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 ) \ && echo 'UTC' > etc/timezone \ - && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS.gz ${STAGE3} + && rm ${STAGE3}.asc ${STAGE3}.CONTENTS.gz ${STAGE3} FROM scratch