diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 12:27:23 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 12:27:23 +0100 |
| commit | 050f022f030daf5488a4a1508189c0fecb27ffdc (patch) | |
| tree | 0c31c74a604e513a3c7ddab7c9b217467b2801ca /docker | |
| parent | 37e7f4f716a76ebc789a38308e1ae89f3b43279c (diff) | |
| download | deployment-050f022f030daf5488a4a1508189c0fecb27ffdc.tar.gz deployment-050f022f030daf5488a4a1508189c0fecb27ffdc.tar.bz2 deployment-050f022f030daf5488a4a1508189c0fecb27ffdc.zip | |
Dockerizing merchant. First steps.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/exchange/docker-compose.yml (renamed from docker/docker-compose.yml) | 6 | ||||
| -rw-r--r-- | docker/merchant/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/merchant/docker-compose.yml | 13 |
3 files changed, 22 insertions, 6 deletions
diff --git a/docker/docker-compose.yml b/docker/exchange/docker-compose.yml index 58fac20..c0f1b89 100644 --- a/docker/docker-compose.yml +++ b/docker/exchange/docker-compose.yml @@ -1,16 +1,16 @@ version: '2' services: exchange: - build: ./exchange + build: . depends_on: - dbcontainer base: - build: ./base + build: ../base image: taler/base dbcontainer: image: postgres nginx: - build: ./nginx + build: ../nginx depends_on: - exchange ports: diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile index 6385c96..5e4a480 100644 --- a/docker/merchant/Dockerfile +++ b/docker/merchant/Dockerfile @@ -1,8 +1,8 @@ -FROM taler/exchange +FROM taler/base -RUN git clone git://taler.net/merchant /merchant +RUN git clone git://taler.net/merchant ~/merchant -WORKDIR /merchant +WORKDIR $HOME/merchant RUN ./bootstrap \ && ./configure CFLAGS='-ggdb -O0' \ @@ -11,3 +11,6 @@ RUN ./bootstrap \ --with-microhttpd=/usr/local \ && make \ && make install + +ENTRYPOINT taler-merchant-dbinit -t + && taler-merchant-httpd diff --git a/docker/merchant/docker-compose.yml b/docker/merchant/docker-compose.yml new file mode 100644 index 0000000..ee78fc1 --- /dev/null +++ b/docker/merchant/docker-compose.yml @@ -0,0 +1,13 @@ +version: '2' +services: + merchant: + build: . + depends_on: + - dbcontainer + ports: + - "80:80" + base: + build: ../base + image: taler/base + dbcontainer: + image: postgres |