[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: merge bank UI into libeufin co
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: merge bank UI into libeufin container |
Date: |
Tue, 01 Nov 2022 18:18:48 +0100 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 61cf5c5 merge bank UI into libeufin container
61cf5c5 is described below
commit 61cf5c57c593f1ea6ee5f13552d82862e2702cb5
Author: MS <ms@taler.net>
AuthorDate: Tue Nov 1 18:18:36 2022 +0100
merge bank UI into libeufin container
---
docker/hybrid/docker-compose.yml | 8 +-------
docker/hybrid/images/bank-ui/Dockerfile | 4 ----
docker/hybrid/images/libeufin/Dockerfile | 1 +
docker/hybrid/images/{bank-ui => libeufin}/nginx.conf | 0
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
similarity index 100%
rename from docker/hybrid/images/bank-ui/nginx.conf
rename to 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
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: merge bank UI into libeufin container,
gnunet <=