summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-23 19:13:29 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-12-23 19:13:29 +0100
commitf0b9686adfbce2d1e4e0d5f01f580f258c5a0e11 (patch)
treea8aadac3bb07abc2428d477d5997982d6f5f85e3
parentb28f62ef241b5663f5ad4df5c003d0e86916acbf (diff)
downloaddeployment-f0b9686adfbce2d1e4e0d5f01f580f258c5a0e11.tar.gz
deployment-f0b9686adfbce2d1e4e0d5f01f580f258c5a0e11.tar.bz2
deployment-f0b9686adfbce2d1e4e0d5f01f580f258c5a0e11.zip
- README
- exporting LD_LIBRARY_PATH through ENV
-rw-r--r--docker/README15
-rw-r--r--docker/base/Dockerfile3
2 files changed, 17 insertions, 1 deletions
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