Merge branch '18947-githttpd'

[arvados.git] / build / package-build-dockerfiles / build-all-build-containers.sh

diff --git a/build/package-build-dockerfiles/build-all-build-containers.sh b/build/package-build-dockerfiles/build-all-build-containers.sh
index 34ffcced7ab6d2893af0ac6423ee877025be98bc..b1eba93ae77f9337472da190cc0439565c45b3a5 100755 (executable)
--- a/build/package-build-dockerfiles/build-all-build-containers.sh
+++ b/build/package-build-dockerfiles/build-all-build-containers.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 make
 
+GOVERSION=$(grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $2}')
+
 for target in `find -maxdepth 1 -type d |grep -v generated`; do
   if [[ "$target" == "." ]]; then
     continue
@@ -9,8 +14,9 @@ for target in `find -maxdepth 1 -type d |grep -v generated`; do
   target=${target#./}
   echo $target
   cd $target
-  docker build -t arvados/build:$target .
+  docker build --tag arvados/build:$target \
+    --build-arg HOSTTYPE=$HOSTTYPE \
+    --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+    --build-arg GOVERSION=$GOVERSION --no-cache .
   cd ..
 done
-
-