[taler-deployment] branch master updated (967b9c4 -> 893b5da)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository deployment.

    from 967b9c4  Changing container host ports to localhost
     new 3555746  simplify
     new 893b5da  simplify

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 sandcastle/.gitignore                              |  1 -
 sandcastle/build_base.sh                           | 36 ++++++++--------------
 sandcastle/{tags-stable.sh => buildconfig/tags.sh} |  0
 3 files changed, 13 insertions(+), 24 deletions(-)
 rename sandcastle/{tags-stable.sh => buildconfig/tags.sh} (100%)

diff --git a/sandcastle/.gitignore b/sandcastle/.gitignore
index 026a205..e69de29 100644
--- a/sandcastle/.gitignore
+++ b/sandcastle/.gitignore
@@ -1 +0,0 @@
-buildconfig/tags.sh
diff --git a/sandcastle/build_base.sh b/sandcastle/build_base.sh
index 655d204..2c746e2 100755
--- a/sandcastle/build_base.sh
+++ b/sandcastle/build_base.sh
@@ -5,16 +5,12 @@
 set -e
 
 usage () {
-  echo Usage: ./build_base.sh [-h,  --help] [tags-file]
+  echo Usage: ./build_base.sh [-h, --help]
   echo
-  echo Builds the taler_local/taler_base base image, optionally
-  echo using the 'tags-file', a text file containing environment
+  echo Builds the taler_local/taler_base base image,
+  echo using the buildconfig/tags.sh, a bash file containing environment
   echo variables definitions to specify to which Git tag each Taler
-  echo component should be pulled.  The following tags exist:
-  echo TAG_LIBMHD, TAG_GNUNET, TAG_EXCHANGE, TAG_MERCHANT,
-  echo TAG_WALLET, TAG_LIBEUFIN, TAG_MERCHANT_DEMOS, TAG_SYNC.
-  echo If tags-file is missing, all the code will be pulled
-  echo from master\'s HEAD.
+  echo component should be pulled.
 }
 
 for helpOpt in "-h" "--help"; do
@@ -25,32 +21,26 @@ for helpOpt in "-h" "--help"; do
 done
 
 if ! which realpath > /dev/null; then
-  echo "Please, install 'realpath' (coreutils)"
+  echo "Please install 'realpath' (coreutils)"
 fi
 
-DOCKER_FILE="$(dirname $(realpath $BASH_SOURCE))/images/base/Dockerfile"
+DOCKER_FILE="images/base/Dockerfile"
 
-# Check base file.
-if ! test -a $DOCKER_FILE; then
+if [[ ! -e $DOCKER_FILE ]]; then
   echo Base Dockerfile: $DOCKER_FILE not found.
   exit 1
 fi
 
+if [[ ! -e buildconfig/tags.sh ]]; then
+  echo "buildconfig/tags.sh required but does not exist"
+  exit 1
+fi
+
 # Allows extra features to conditionally copy files
 # from the host during the build.  That solves the
 # case where the tag file is not given.
 export DOCKER_BUILDKIT=1
 
-mkdir -p buildconfig
-
-# --help option not found in $1, check for the tags-file.
-if test -n "$1"; then
-  ! test -a "$1" && (echo "Tag file: $1 not found." && exit 1) 
-  cp $1 buildconfig/tags.sh
-else
-  echo "" > buildconfig/tags.sh
-fi
-
-docker build --no-cache \
+exec docker build --no-cache \
   -t taler_local/taler_base \
   -f $DOCKER_FILE .
diff --git a/sandcastle/tags-stable.sh b/sandcastle/buildconfig/tags.sh
similarity index 100%
rename from sandcastle/tags-stable.sh
rename to sandcastle/buildconfig/tags.sh

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.