diff options
| author |   Sam James <sam@gentoo.org> | 2022-02-15 03:03:07 +0000 |
|---|---|---|
| committer |   Alexys Jacob <ultrabug@gentoo.org> | 2022-02-18 17:39:09 +0000 |
| commit | 7aea4fa952454731779696bda1fdd3d605b8f07b (patch) | |
| tree | 9b76e784448a734c904860d10c0fb402447688f0 | |
| parent | Add stage3:desktop (just amd64-desktop-openrc for now) (diff) | |
| download | docker-images-7aea4fa952454731779696bda1fdd3d605b8f07b.tar.gz docker-images-7aea4fa952454731779696bda1fdd3d605b8f07b.tar.bz2 docker-images-7aea4fa952454731779696bda1fdd3d605b8f07b.zip | |
Update for new .asc layout
Signed-off-by: Sam James <sam@gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/117
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
| -rw-r--r-- | stage3.Dockerfile | 7 |
1 files 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 |