diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-23 22:32:08 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-23 22:32:08 +0100 |
| commit | bdd84660db839e7c71bd5b6b28a04caa8fac09a1 (patch) | |
| tree | 01331eee78afa069be252063daa1c7705d98fcc8 /docker | |
| parent | c4bd76152428f705b33c6d6566e56ebf95d62b82 (diff) | |
| download | deployment-bdd84660db839e7c71bd5b6b28a04caa8fac09a1.tar.gz deployment-bdd84660db839e7c71bd5b6b28a04caa8fac09a1.tar.bz2 deployment-bdd84660db839e7c71bd5b6b28a04caa8fac09a1.zip | |
Connecting base and exchange container with the db
container.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 6 | ||||
| -rw-r--r-- | docker/exchange/Dockerfile | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 19242ee..871af13 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -52,5 +52,5 @@ RUN export TALER_CONFIG_ENV="test" \ && export LC_ALL="C.UTF-8" \ && export LANG="C.UTF-8" \ && ./bin/taler-deployment-config-generate - #&& su -c "createuser root" postgres \ - #su -c "createdb talertest" postgres + && su -c "createuser --host=dbcontainer root" postgres \ + su -c "createdb --host=dbcontainer talertest" postgres diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index efc4839..19390dc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,11 +3,11 @@ services: exchange: build: ./exchange links: - - db + - dbcontainer base: build: ./base image: taler/base links: - - db - db: + - dbcontainer + dbcontainer: build: postgres diff --git a/docker/exchange/Dockerfile b/docker/exchange/Dockerfile index afd1152..e7f356b 100644 --- a/docker/exchange/Dockerfile +++ b/docker/exchange/Dockerfile @@ -14,10 +14,12 @@ RUN ./bootstrap \ RUN mkdir -p $HOME/shared-data/exchange/offline-keys/ \ && gnunet-ecc -g1 $HOME/shared-data/exchange/offline-keys/master.priv \ + && taler-config -s exchangedb-postgres -o db_conn_str \ + -V "dbname=talertest hostname=dbcontainer" \ && taler-config -s exchange -o serve -V tcp \ - && taler-config -s exchange -o master_public_key -V \ - $(gnunet-ecc -p $HOME/shared-data/exchange/offline-keys/master.priv) + && taler-config -s exchange -o master_public_key \ + -V $(gnunet-ecc -p $HOME/shared-data/exchange/offline-keys/master.priv) RUN $HOME/deployment/bin/taler-deployment-config-sign \ - && $HOME/deployment/bin/taler-deployment-keyup -# taler-exchange-dbinit -r # Problematic, no db running.. + && $HOME/deployment/bin/taler-deployment-keyup \ + && taler-exchange-dbinit -r |