diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-29 15:33:29 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-12-29 15:33:39 +0100 |
| commit | 84dc4bc2fe5587fbbadb44690f4ab5b7bb8706ca (patch) | |
| tree | 289da625c312ca1b97a4e114859629a71464f9ce | |
| parent | 66abd911caa7f9610704aa9cbef3c35a0e567a53 (diff) | |
| download | deployment-84dc4bc2fe5587fbbadb44690f4ab5b7bb8706ca.tar.gz deployment-84dc4bc2fe5587fbbadb44690f4ab5b7bb8706ca.tar.bz2 deployment-84dc4bc2fe5587fbbadb44690f4ab5b7bb8706ca.zip | |
Moving the postgres job out of base container
| -rw-r--r-- | docker/base/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/debug/client/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/exchange/Dockerfile | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 13b1ebb..39e2c32 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -51,6 +51,4 @@ RUN export TALER_CONFIG_ENV="test" \ && export TALER_CONFIG_CURRENCY="EUR" \ && export LC_ALL="C.UTF-8" \ && export LANG="C.UTF-8" \ - && ./bin/taler-deployment-config-generate \ - && su -c "createuser --host=dbcontainer root" postgres \ - && su -c "createdb --host=dbcontainer talertest" postgres + && ./bin/taler-deployment-config-generate diff --git a/docker/debug/client/Dockerfile b/docker/debug/client/Dockerfile index 90841c7..0a2370e 100644 --- a/docker/debug/client/Dockerfile +++ b/docker/debug/client/Dockerfile @@ -1,8 +1,7 @@ FROM debian:unstable +RUN apt-get update && apt-get install -qqy postgresql -RUN apt-get update && apt-get install -qqy \ - postgresql - +# Needs the container running (not done by 'docker-compose run'). RUN su -c "createuser --host=dbcontainer root" postgres \ && su -c "createdb --host=dbcontainer talertest" postgres diff --git a/docker/exchange/Dockerfile b/docker/exchange/Dockerfile index dbd3650..4393fec 100644 --- a/docker/exchange/Dockerfile +++ b/docker/exchange/Dockerfile @@ -12,6 +12,9 @@ RUN ./bootstrap \ && make \ && make install +RUN su -c "createuser --host=dbcontainer root" postgres \ + && su -c "createdb --host=dbcontainer talertest" postgres + 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 \ |