diff options
| author |   Brett Randall <javabrett@gmail.com> | 2017-12-13 20:46:35 +1100 |
|---|---|---|
| committer |   Manuel Rüger <manuel@rueg.eu> | 2017-12-15 17:51:04 +0100 |
| commit | 486d7f8740196472fea32a661c1844f2c209f8d1 (patch) | |
| tree | a78a59b856e63497e14a3310d3dfd8bdd55fefe2 | |
| parent | gpg/dirmngr: disabled IPv6 - there seems to be a DNS or route problem with sk... (diff) | |
| download | docker-images-486d7f8740196472fea32a661c1844f2c209f8d1.tar.gz docker-images-486d7f8740196472fea32a661c1844f2c209f8d1.tar.bz2 docker-images-486d7f8740196472fea32a661c1844f2c209f8d1.zip | |
Removed trailing / in DIST, made STAGEPATH more verbose. Removed -c from wget-s.
| -rw-r--r-- | portage.Dockerfile | 2 | ||||
| -rw-r--r-- | stage3.Dockerfile | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/portage.Dockerfile b/portage.Dockerfile index be90704..b795bd6 100644 --- a/portage.Dockerfile +++ b/portage.Dockerfile @@ -15,7 +15,7 @@ ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/snapshots" ARG SIGNING_KEY="0xEC590EEAC9189250" RUN apk add --no-cache gnupg tar wget xz \ - && wget -q -c "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \ + && wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \ && gpg --list-keys \ && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \ diff --git a/stage3.Dockerfile b/stage3.Dockerfile index 4c4593c..4fa10ce 100644 --- a/stage3.Dockerfile +++ b/stage3.Dockerfile @@ -14,14 +14,15 @@ WORKDIR /gentoo ARG ARCH=amd64 ARG MICROARCH=amd64 ARG SUFFIX -ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/releases/${ARCH}/autobuilds/" +ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/releases/${ARCH}/autobuilds" ARG SIGNING_KEY="0xBB572E0E2D182910" RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}" \ && apk --no-cache add gnupg tar wget \ - && STAGE3PATH="$(wget -q -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \ + && STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \ + && echo "STAGE3PATH:" $STAGE3PATH \ && STAGE3="$(basename ${STAGE3PATH})" \ - && wget -q -c "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \ + && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \ && gpg --list-keys \ && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \ |