build.sh: Die with an error if a wget fails

[dockerfile.git] / build.sh

diff --git a/build.sh b/build.sh
index 7f9c1c43066f4c82c1604d3a390724c4b91fb54f..30286f754561926ef962608f2ae2772221856efe 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ AUTHOR="${AUTHOR:-W. Trevor King <wking@tremily.us>}"
 NAMESPACE="${NAMESPACE:-wking}"
 DATE="${DATE:-20140206}"
 MIRROR="${MIRROR:-http://distfiles.gentoo.org/}"
-ARCH_URL="${ARCH_URL:-${MIRROR}releases/amd64/current-stage3/}"
+ARCH_URL="${ARCH_URL:-${MIRROR}releases/amd64/autobuilds/${DATE}/}"
 STAGE3="${STAGE3:-stage3-amd64-${DATE}.tar.bz2}"
 STAGE3_CONTENTS="${STAGE3_CONTENTS:-${STAGE3}.CONTENTS}"
 STAGE3_DIGESTS="${STAGE3_DIGESTS:-${STAGE3}.DIGESTS.asc}"
@@ -38,6 +38,7 @@ PORTAGE_SIG="${PORTAGE_SIG:-${PORTAGE}.gpgsig}"
 
 DOCKER_IO=$(command -v docker.io)
 DOCKER="${DOCKER:-${DOCKER_IO:-docker}}"
+BUILD_OPTS="${BUILD_OPTS:-}"
 
 REPOS="${REPOS:-
        portage
@@ -46,6 +47,7 @@ REPOS="${REPOS:-
        gentoo-syslog
        gentoo-java
        buildbot
+       docker-registry
        elasticsearch
        memcached
        nginx
@@ -108,7 +110,8 @@ import_stage3()
 
                for FILE in "${STAGE3}" "${STAGE3_CONTENTS}" "${STAGE3_DIGESTS}"; do
                        if [ ! -f "downloads/${FILE}" ]; then
-                               wget -O "downloads/${FILE}" "${ARCH_URL}${FILE}"
+                               wget -O "downloads/${FILE}" "${ARCH_URL}${FILE}" ||
+                                       die "failed to download ${ARCH_URL}${FILE}"
                        fi
                done
 
@@ -142,7 +145,8 @@ import_portage()
 
                for FILE in "${PORTAGE}" "${PORTAGE_SIG}"; do
                        if [ ! -f "downloads/${FILE}" ]; then
-                               wget -O "downloads/${FILE}" "${PORTAGE_URL}${FILE}"
+                               wget -O "downloads/${FILE}" "${PORTAGE_URL}${FILE}" ||
+                                       die "failed to download ${PORTAGE_URL}${FILE}"
                        fi
                done
 
@@ -202,7 +206,7 @@ build_repo()
                                < "${REPO}/Dockerfile.template" > "${REPO}/Dockerfile"
 
                msg "build ${NAMESPACE}/${REPO}:${DATE}"
-               "${DOCKER}" build -t "${NAMESPACE}/${REPO}:${DATE}" "${REPO}" || die "failed to build"
+               "${DOCKER}" build ${BUILD_OPTS} -t "${NAMESPACE}/${REPO}:${DATE}" "${REPO}" || die "failed to build"
        fi
        msg "tag ${NAMESPACE}/${REPO}:latest"
        "${DOCKER}" tag -f "${NAMESPACE}/${REPO}:${DATE}" "${NAMESPACE}/${REPO}:latest" || die "failed to tag"