Docker: merchant starts

3 files changed, 31 insertions, 16 deletions

diff --git a/docker/hybrid/images/exchange/Dockerfile b/docker/hybrid/images/exchange/Dockerfile
index 0289729..4f744a5 100644
--- a/docker/hybrid/images/exchange/Dockerfile
+++ b/docker/hybrid/images/exchange/Dockerfile
@@ -1,13 +1,6 @@
 FROM taler_local/taler_base
-RUN git clone git://git.taler.net/exchange /exchange
-
-WORKDIR /exchange
-RUN ./bootstrap
-RUN ./configure CFLAGS="-ggdb -O0" --enable-logging=verbose --disable-doc
-RUN make install
 
 COPY taler.conf /config/taler.conf
 COPY startup.sh /
 RUN chmod +x /startup.sh
-
 ENTRYPOINT /startup.sh
diff --git a/docker/hybrid/images/exchange/startup.sh b/docker/hybrid/images/exchange/startup.sh
index 6d26550..9fe4052 100644
--- a/docker/hybrid/images/exchange/startup.sh
+++ b/docker/hybrid/images/exchange/startup.sh
@@ -3,7 +3,8 @@
 set -eu
 export LD_LIBRARY_PATH=/usr/local/lib
 
-sed -i 's/\${EXCHANGE_URL}/http:\/\/exchange.example.com\//' /config/taler.conf
+sed -i 's/\${EXCHANGE_URL}/http:\/\/exchange:80\//' /config/taler.conf
+sed -i 's/\${CURRENCY}/EUR/' /config/taler.conf
 
 while ! pg_isready -h talerdb -d taler; do
   echo DB not ready yet.
@@ -14,12 +15,28 @@ echo Now DB is ready.
 # Make sure we have the right to connect
 echo "" | psql -h talerdb -d taler
 
-taler-exchange-dbinit -L DEBUG -c /config/taler.conf # --reset # &> /dev/null
+taler-exchange-dbinit -c /config/taler.conf --reset # &> /dev/null
 
-#taler-exchange-secmod-eddsa -c /config/taler.conf &
-#taler-exchange-secmod-rsa -c /config/taler.conf &
-#taler-exchange-secmod-cs -c /config/taler.conf &
+taler-exchange-secmod-eddsa -c /config/taler.conf &
+taler-exchange-secmod-rsa -c /config/taler.conf &
+taler-exchange-secmod-cs -c /config/taler.conf &
+echo "Crypto helpers started.."
+EXCHANGE_MASTER_PUB=$(taler-exchange-offline -c /config/taler.conf setup)
+sed -i "s/\${EXCHANGE_MASTER_PUB}/$EXCHANGE_MASTER_PUB/" /config/taler.conf
+taler-exchange-httpd -c /config/taler.conf &
+for n in `seq 1 80`
+  do
+    echo "."
+    sleep 0.1
+    OK=1
+    wget http://exchange/ -o /dev/null -O /dev/null >/dev/null && break
+    OK=0
+  done
+  if [ 1 != $OK ]
+  then
+      echo "Failed to launch Exchange"
+  fi
+echo Echange launched.
 
-#EXCHANGE_MASTER_PUB=$(taler-exchange-offline -c /config/taler.conf setup)
-#sed -i "s/\${EXCHANGE_MASTER_PUB}/$EXCHANGE_MASTER_PUB/" /config/taler.conf
-#taler-exchange-httpd -c /config/taler.conf
+taler-exchange-offline -c /config/taler.conf download sign upload
+wait
diff --git a/docker/hybrid/images/exchange/taler.conf b/docker/hybrid/images/exchange/taler.conf
index ca78bf6..dd93b3d 100644
--- a/docker/hybrid/images/exchange/taler.conf
+++ b/docker/hybrid/images/exchange/taler.conf
@@ -5,6 +5,9 @@
 # CURRENCY
 # EXCHANGE_MASTER_PUB
 
+[taler]
+currency = ${CURRENCY}
+
 [paths]
 taler_data_home = /data
 
@@ -36,7 +39,9 @@ privacy_dir = /usr/local/share/taler/exchange/pp
 terms_dir = /usr/local/share/taler/exchange/tos
 base_url = ${EXCHANGE_URL}
 unixpath = /sockets/exchange.sock
-serve = unix
+serve = tcp
+port = 80
+# serve = unix
 
 [exchangedb-postgres]
 config = postgres://talerdb/taler