From f0b9686adfbce2d1e4e0d5f01f580f258c5a0e11 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 23 Dec 2016 19:13:29 +0100
Subject: - README - exporting LD_LIBRARY_PATH through ENV

---
 docker/README          | 15 +++++++++++++++
 docker/base/Dockerfile |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docker/README b/docker/README
index ab43f7c..69aa574 100644
--- a/docker/README
+++ b/docker/README
@@ -1,3 +1,18 @@
+=== The Compose way ==
+
+This way of building things is the preferred one:
+just running,
+
+$ docker-compose up
+
+from <THIS_REPO/docker>, should build all the images.
+
+Only the base image and the exchange are currently supposed
+to be built this way.
+
+Ideally, a compose recipe for the exchange and one for merchant
+backend should be made available.
+
 === How to use these images ===
 
 From a "docker ready" environment, you need to (1) build the
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index d3def45..5b0bf82 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -45,11 +45,12 @@ RUN ./bootstrap \
 # To run the config generator, need:
 WORKDIR $HOME/deployment
 
+ENV LD_LIBRARY_PATH "/usr/local/lib"
+
 RUN export TALER_CONFIG_ENV="test" \
     && export TALER_CONFIG_CURRENCY="EUR" \
     && export LC_ALL="C.UTF-8" \
     && export LANG="C.UTF-8" \
-    && export LD_LIBRARY_PATH="/usr/local/lib" \
     && ./bin/taler-deployment-config-generate \
     && su -c "createuser root" postgres \
     su -c "createdb talertest" postgres
-- 
cgit v1.2.3