diff options
author | MS <ms@taler.net> | 2022-11-01 15:38:11 +0100 |
---|---|---|
committer | MS <ms@taler.net> | 2022-11-01 15:38:11 +0100 |
commit | b9051030a590ffd60bd4b6efd2ad53ffb34b1324 (patch) | |
tree | 33ef295e445254555c5022536cd11efa74790375 /docker/hybrid | |
parent | f7c72d687872319e8b438e152d5fc3f02a32a4fe (diff) | |
download | deployment-b9051030a590ffd60bd4b6efd2ad53ffb34b1324.tar.gz deployment-b9051030a590ffd60bd4b6efd2ad53ffb34b1324.tar.bz2 deployment-b9051030a590ffd60bd4b6efd2ad53ffb34b1324.zip |
bank SPA container
Diffstat (limited to 'docker/hybrid')
-rw-r--r-- | docker/hybrid/config/deployment.conf | 2 | ||||
-rw-r--r-- | docker/hybrid/docker-compose.yml | 7 | ||||
-rw-r--r-- | docker/hybrid/images/bank-ui/Dockerfile | 4 | ||||
-rw-r--r-- | docker/hybrid/images/bank-ui/nginx.conf | 14 | ||||
-rw-r--r-- | docker/hybrid/images/base/Dockerfile | 11 |
5 files changed, 34 insertions, 4 deletions
diff --git a/docker/hybrid/config/deployment.conf b/docker/hybrid/config/deployment.conf index 6b4d052..78d7240 100644 --- a/docker/hybrid/config/deployment.conf +++ b/docker/hybrid/config/deployment.conf @@ -10,7 +10,7 @@ landing-url = http://localhost:5562/ blog-url = http://localhost:5559/ donations-url = http://localhost:5560/ survey-url = http://localhost:5561/ -bank-url = http://localhost:15000/ +bank-url = http://localhost:15002/ # Bank accounts exchange-sandbox-username = exchange-at-sandbox diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml index 34c3791..818e057 100644 --- a/docker/hybrid/docker-compose.yml +++ b/docker/hybrid/docker-compose.yml @@ -61,3 +61,10 @@ services: - talerlogs:/logs - talerdata:/data - ${TALER_DEPLOYMENT_CONFIG:?Please export TALER_DEPLOYMENT_CONFIG}:/config/deployment.conf + + bank-ui: + build: ./images/bank-ui + ports: + - 15002:80 # Nginx serving the SPA + volumes: + - talerlogs:/logs diff --git a/docker/hybrid/images/bank-ui/Dockerfile b/docker/hybrid/images/bank-ui/Dockerfile new file mode 100644 index 0000000..ff79752 --- /dev/null +++ b/docker/hybrid/images/bank-ui/Dockerfile @@ -0,0 +1,4 @@ +FROM taler_local/taler_base + +COPY nginx.conf / +ENTRYPOINT nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d 86400 diff --git a/docker/hybrid/images/bank-ui/nginx.conf b/docker/hybrid/images/bank-ui/nginx.conf new file mode 100644 index 0000000..d5436f5 --- /dev/null +++ b/docker/hybrid/images/bank-ui/nginx.conf @@ -0,0 +1,14 @@ +error_log /dev/stdout; +daemon off; +events {} +http { + access_log /dev/stdout; + server { + include /etc/nginx/mime.types; + listen 80; + listen [::]:80; + location / { + root /usr/local/share/taler/demobank-ui; + } + } +} diff --git a/docker/hybrid/images/base/Dockerfile b/docker/hybrid/images/base/Dockerfile index 59e2bee..3d12cf9 100644 --- a/docker/hybrid/images/base/Dockerfile +++ b/docker/hybrid/images/base/Dockerfile @@ -5,9 +5,9 @@ RUN apt-get install -y autoconf autopoint libtool texinfo \ libgcrypt-dev libidn11-dev zlib1g-dev libunistring-dev \ libjansson-dev python3-pip git recutils libsqlite3-dev \ libpq-dev postgresql libcurl4-openssl-dev libsodium-dev git \ - libqrencode-dev zip jq nodejs npm openjdk-17-jre nginx procps \ - curl python3-jinja2 wget curl python3-sphinx \ - socat python3-sphinx-rtd-theme apache2-utils + libqrencode-dev zip jq npm openjdk-17-jre nginx procps \ + curl python3-jinja2 wget curl python3-sphinx socat apache2-utils \ + python3-sphinx-rtd-theme RUN pip3 install requests click poetry uwsgi @@ -51,6 +51,11 @@ RUN ./bootstrap RUN ./configure RUN make install + +# From: https://github.com/nodesource/distributions/blob/master/README.md#debinstall +RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash - && \ +apt-get install -y nodejs +RUN npm install -g pnpm WORKDIR /wallet-core RUN ./bootstrap WORKDIR ./packages/demobank-ui |