diff options
| author | MS <ms@taler.net> | 2022-11-01 18:18:36 +0100 |
|---|---|---|
| committer | MS <ms@taler.net> | 2022-11-01 18:18:36 +0100 |
| commit | 61cf5c57c593f1ea6ee5f13552d82862e2702cb5 (patch) | |
| tree | 6c98570b77eb413d9b1a4c37c2891e07e412da0f /docker/hybrid | |
| parent | ee865ba261c59c5fb44a84362047b4526174f72f (diff) | |
| download | deployment-61cf5c57c593f1ea6ee5f13552d82862e2702cb5.tar.gz deployment-61cf5c57c593f1ea6ee5f13552d82862e2702cb5.tar.bz2 deployment-61cf5c57c593f1ea6ee5f13552d82862e2702cb5.zip | |
merge bank UI into libeufin container
Diffstat (limited to 'docker/hybrid')
| -rw-r--r-- | docker/hybrid/docker-compose.yml | 8 | ||||
| -rw-r--r-- | docker/hybrid/images/bank-ui/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/hybrid/images/libeufin/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/hybrid/images/libeufin/nginx.conf (renamed from docker/hybrid/images/bank-ui/nginx.conf) | 0 | ||||
| -rw-r--r-- | docker/hybrid/images/libeufin/startup.sh | 3 |
5 files changed, 4 insertions, 12 deletions
diff --git a/docker/hybrid/docker-compose.yml b/docker/hybrid/docker-compose.yml index 818e057..5e763a2 100644 --- a/docker/hybrid/docker-compose.yml +++ b/docker/hybrid/docker-compose.yml @@ -57,14 +57,8 @@ services: ports: - 15000:15000 # Sandbox - 15001:15001 # Nexus + - 15002:80 # Nginx serving the SPA volumes: - 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 deleted file mode 100644 index ff79752..0000000 --- a/docker/hybrid/images/bank-ui/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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/libeufin/Dockerfile b/docker/hybrid/images/libeufin/Dockerfile index 295887c..e55c80d 100644 --- a/docker/hybrid/images/libeufin/Dockerfile +++ b/docker/hybrid/images/libeufin/Dockerfile @@ -3,4 +3,5 @@ FROM taler_local/taler_base COPY startup.sh / COPY create_bank_accounts.sh / RUN chmod +x /startup.sh +COPY nginx.conf / ENTRYPOINT /startup.sh diff --git a/docker/hybrid/images/bank-ui/nginx.conf b/docker/hybrid/images/libeufin/nginx.conf index d5436f5..d5436f5 100644 --- a/docker/hybrid/images/bank-ui/nginx.conf +++ b/docker/hybrid/images/libeufin/nginx.conf diff --git a/docker/hybrid/images/libeufin/startup.sh b/docker/hybrid/images/libeufin/startup.sh index 667a2a5..1132211 100644 --- a/docker/hybrid/images/libeufin/startup.sh +++ b/docker/hybrid/images/libeufin/startup.sh @@ -162,7 +162,8 @@ test -a $INIT_MARKER || libeufin-cli facades \ --currency ${CURRENCY} --facade-name $FACADE_NAME \ talerconn $NEXUS_IMPORTED_BANKACCOUNT echo DONE - +# starting the SPA +nginx -c /nginx.conf 2>&1 | rotatelogs -e /logs/bank-ui-%Y-%m-%d 86400 & touch $INIT_MARKER wait |