From 84dc4bc2fe5587fbbadb44690f4ab5b7bb8706ca Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Thu, 29 Dec 2016 15:33:29 +0100 Subject: Moving the postgres job out of base container --- docker/base/Dockerfile | 4 +--- docker/debug/client/Dockerfile | 5 ++--- 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 \ -- cgit v1.2.3