[taler-grid5k] 87/189: cflags via variables

[gnunet]

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

marco-boss pushed a commit to branch master
in repository grid5k.

commit 2b2ce374dd3f905b6df624435786495e83380bca
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Mar 17 11:58:06 2022 +0100

    cflags via variables
---
 docker/Dockerfile    |  5 -----
 docker/entrypoint.sh | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a7d433d..035443b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,11 +10,6 @@ build the binaries directly"
 ENV DEBIAN_FRONTEND=noninteractive
 
 ENV GRID5K_DEST=lyon,lille \
-    GNUNET_COMMIT_SHA=master \
-    EXCHANGE_COMMIT_SHA=master \
-    MERCHANT_COMMIT_SHA=master \
-    WALLET_COMMIT_SHA=master \
-    GRID5K_COMMIT_SHA=master \
     TALER_HOME=/taler
 
 RUN apt update && \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 506af28..1087d0a 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -97,12 +97,12 @@ then
   echo "INFO building image"
   yes r | kameleon build \
           -b /tmp taler-debian11.yaml \
-          -g gnunet_commit_sha:${GNUNET_COMMIT_SHA} \
-             exchange_commit_sha:${EXCHANGE_COMMIT_SHA} \
-             merchant_commit_sha:${MERCHANT_COMMIT_SHA} \
-             wallet_commit_sha:${WALLET_COMMIT_SHA} \
-            grid5k_commit_sha:${GRID5K_COMMIT_SHA} \
-            libmicrohttpd_cflags:${MICROHTTPD_CFLAGS:-"-O2"} \
+          -g gnunet_commit_sha:${GNUNET_COMMIT_SHA:-master} \
+             exchange_commit_sha:${EXCHANGE_COMMIT_SHA:-master} \
+             merchant_commit_sha:${MERCHANT_COMMIT_SHA:-master} \
+             wallet_commit_sha:${WALLET_COMMIT_SHA:-master} \
+            grid5k_commit_sha:${GRID5K_COMMIT_SHA:-master} \
+            libmicrohttpd_cflags:${LIBMICROHTTPD_CFLAGS:-"-O2"} \
             gnunet_cflags:${GNUNET_CFLAGS:-"-O2"} \
             exchange_cflags:${EXCHANGE_CFLAGS:-"-O2"} \
             merchant_cflags:${MERCHANT_CFLAGS:-"-O2"} \

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