X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=build.sh;h=9556c0a952ebef3d8431c6988ba894ef1be7b46d;hb=3288f5101a8a08f33c807935c7d54b10aba66895;hp=b240fd14b6e949e7e1b99ccbbac0f4d85d5ea7e7;hpb=710291e38961d4ebb7afac8e04fd13b4572cfd89;p=dockerfile.git

diff --git a/build.sh b/build.sh
index b240fd1..9556c0a 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2013 W. Trevor King <wking@tremily.us>
+# Copyright (C) 2013-2014 W. Trevor King <wking@tremily.us>
+# Copyright (C) 2014 Naohiro Aota <naota@gentoo.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,8 +26,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 AUTHOR="${AUTHOR:-W. Trevor King <wking@tremily.us>}"
-NAMESPACE="${NAMESPACE:-wking}"
-DATE="${DATE:-20140206}"
+NAMESPACE="${NAMESPACE:-$(id -u -n)}"
+DATE="${DATE:-20160804}"
 MIRROR="${MIRROR:-http://distfiles.gentoo.org/}"
 ARCH_URL="${ARCH_URL:-${MIRROR}releases/amd64/autobuilds/${DATE}/}"
 STAGE3="${STAGE3:-stage3-amd64-${DATE}.tar.bz2}"
@@ -43,24 +44,34 @@ BUILD_OPTS="${BUILD_OPTS:-}"
 REPOS="${REPOS:-
 	portage
 	gentoo-portage
+	gentoo-python
+	gentoo-utc
 	gentoo-en-us
+	gentoo-openrc
 	gentoo-syslog
 	gentoo-java
 	gentoo-layman
+	gentoo-node
 	buildbot
 	docker-registry
 	elasticsearch
-	kibana
-	kibana-azure
+	hubot
+	irker
 	memcached
+	nagios
 	nginx
 	nginx-proxy
+	kibana
+	kibana-azure
 	ngircd
 	package-cache
 	postgresql
 	redis
+	salt
+	salt-master
 	salt-minion
 	stunnel
+	thumbor
 	}"
 
 die()
@@ -120,7 +131,8 @@ import_stage3()
 			fi
 		done
 
-		gpg --verify "downloads/${STAGE3_DIGESTS}" || die "insecure digests"
+		gpg --verify "downloads/${STAGE3_DIGESTS}" ||
+			die "insecure digests for gentoo"
 		SHA512_HASHES=$(grep -A1 SHA512 "downloads/${STAGE3_DIGESTS}" | grep -v '^--')
 		SHA512_CHECK=$(cd downloads/ && (echo "${SHA512_HASHES}" | sha512sum -c))
 		SHA512_FAILED=$(echo "${SHA512_CHECK}" | grep FAILED)
@@ -129,11 +141,13 @@ import_stage3()
 		fi
 
 		msg "import ${NAMESPACE}/gentoo:${DATE}"
-		"${DOCKER}" import - "${NAMESPACE}/gentoo:${DATE}" < "downloads/${STAGE3}" || die "failed to import"
+		"${DOCKER}" import - "${NAMESPACE}/gentoo:${DATE}" < "downloads/${STAGE3}" ||
+			die "failed to import gentoo"
 	fi
 
 	msg "tag ${NAMESPACE}/gentoo:latest"
-	"${DOCKER}" tag -f "${NAMESPACE}/gentoo:${DATE}" "${NAMESPACE}/gentoo:latest" || die "failed to tag"
+	"${DOCKER}" tag -f "${NAMESPACE}/gentoo:${DATE}" "${NAMESPACE}/gentoo:latest" ||
+			die "failed to tag gentoo"
 }
 
 # If they don't already exist:
@@ -155,14 +169,17 @@ import_portage()
 			fi
 		done
 
-		gpg --verify "downloads/${PORTAGE_SIG}" "downloads/${PORTAGE}" || die "insecure digests"
+		gpg --verify "downloads/${PORTAGE_SIG}" "downloads/${PORTAGE}" ||
+			die "insecure digests for portage-import"
 
 		msg "import ${NAMESPACE}/portage-import:${DATE}"
-		"${DOCKER}" import - "${NAMESPACE}/portage-import:${DATE}" < "downloads/${PORTAGE}" || die "failed to import"
+		"${DOCKER}" import - "${NAMESPACE}/portage-import:${DATE}" < "downloads/${PORTAGE}" ||
+			die "failed to import portage-import"
 	fi
 
 	msg "tag ${NAMESPACE}/portage-import:latest"
-	"${DOCKER}" tag -f "${NAMESPACE}/portage-import:${DATE}" "${NAMESPACE}/portage-import:latest" || die "failed to tag"
+	"${DOCKER}" tag -f "${NAMESPACE}/portage-import:${DATE}" "${NAMESPACE}/portage-import:latest" ||
+		die "failed to tag portage-import"
 }
 
 # extract Busybox for the portage image
@@ -211,10 +228,12 @@ build_repo()
 				< "${REPO}/Dockerfile.template" > "${REPO}/Dockerfile"
 
 		msg "build ${NAMESPACE}/${REPO}:${DATE}"
-		"${DOCKER}" build ${BUILD_OPTS} -t "${NAMESPACE}/${REPO}:${DATE}" "${REPO}" || die "failed to build"
+		"${DOCKER}" build ${BUILD_OPTS} -t "${NAMESPACE}/${REPO}:${DATE}" "${REPO}" ||
+			die "failed to build ${REPO}"
 	fi
 	msg "tag ${NAMESPACE}/${REPO}:latest"
-	"${DOCKER}" tag -f "${NAMESPACE}/${REPO}:${DATE}" "${NAMESPACE}/${REPO}:latest" || die "failed to tag"
+	"${DOCKER}" tag -f "${NAMESPACE}/${REPO}:${DATE}" "${NAMESPACE}/${REPO}:latest" ||
+			die "failed to tag ${REPO}"
 }
 
 build()