From 6ff314ffb018e749c296019979dfe91b35855de2 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Mon, 19 Sep 2022 19:53:38 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20building=20from=20multiple?=
 =?UTF-8?q?=20Dockerfiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This did not work:

./build Dockerfile-core*

Fix this by properly handling multiple given Dockerfiles, i.e. removing
the "Dockerfile-" prefix for all arguments. Fixes gh-61.
---
 build | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/build b/build
index e8a7c2d..3c713e5 100755
--- a/build
+++ b/build
@@ -4,6 +4,25 @@ set -e
 self=`realpath $0`
 self_dir=`dirname "$self"`
 
+
+
+if [ -n "$1" ]; then
+  sub_images=""
+  for arg in "$@"; do
+    arg_sub_image=`echo "$arg" | sed 's/Dockerfile-//'`
+    NL=$'\n'
+    sub_images+="$NL$arg_sub_image"
+  done
+else
+  sub_images=`ls -1 Dockerfile-core* | sed 's/Dockerfile-//'`
+  sub_images="$sub_images `ls -1 Dockerfile-* | sed 's/Dockerfile-//'`"
+fi
+echo "Building:"
+echo "$sub_images"
+echo
+
+
+
 DATA_SUBDIR=data
 get_from_annex() {
   annex_get 'calamari-models/GT4HistOCR/2019-07-22T15_49+0200/*.ckpt*'
@@ -29,12 +48,6 @@ get_from_web() {
 handle_data
 
 
-if [ -n "$1" ]; then
-  sub_images=`echo "$@" | sed 's/Dockerfile-//'`
-else
-  sub_images=`ls -1 Dockerfile-core* | sed 's/Dockerfile-//'`
-  sub_images="$sub_images `ls -1 Dockerfile-* | sed 's/Dockerfile-//'`"
-fi
 
 # Update base images if we build a core image
 if echo "$sub_images" | grep -q core; then