commit: e0ebbffa4a17e91f5224c13de3609a136ca5c2d7 Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com> AuthorDate: Tue May 26 08:13:05 2020 +0000 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> CommitDate: Tue May 26 11:53:17 2020 +0000 URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e0ebbffa
Fix stage3 generation catalyst started gzipping the .CONTENTS file [1]; adjust the stage3 Dockerfile accordingly. [1] https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bb21b8615e64cb31fa9aa9d533ef328dc1374e45 Closes: https://github.com/gentoo/gentoo-docker-images/pull/80 Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> stage3.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage3.Dockerfile b/stage3.Dockerfile index 944aa02..a9dc594 100644 --- a/stage3.Dockerfile +++ b/stage3.Dockerfile @@ -19,7 +19,7 @@ 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" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \ + && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \ && gpg --list-keys \ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \ && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \ @@ -29,7 +29,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${ && 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 ${STAGE3} + && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS.gz ${STAGE3} FROM scratch
