summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2023-05-30 08:04:42 +0200
committerFlorian Dold <florian@dold.me>2023-05-30 08:04:42 +0200
commitb19c1197b4512a656234cb48101a9aba35c1b8f4 (patch)
tree462e28988d00ddccf94ae64c1137a80dee0cbb01
parent7b9b68bd70827dc6c0cfe667115934d5e9cddb6c (diff)
downloaddeployment-b19c1197b4512a656234cb48101a9aba35c1b8f4.tar.gz
deployment-b19c1197b4512a656234cb48101a9aba35c1b8f4.tar.bz2
deployment-b19c1197b4512a656234cb48101a9aba35c1b8f4.zip
sandcastle: move variables into env file
-rw-r--r--sandcastle/docker-compose.yml26
-rw-r--r--sandcastle/sandcastle-variables.env14
2 files changed, 29 insertions, 11 deletions
diff --git a/sandcastle/docker-compose.yml b/sandcastle/docker-compose.yml
index 8d4f18a..ba3d756 100644
--- a/sandcastle/docker-compose.yml
+++ b/sandcastle/docker-compose.yml
@@ -6,10 +6,11 @@ volumes:
services:
talerdb:
+ env_file: sandcastle-variables.env
build: ./images/postgres
image: sandcastle_talerdb
ports:
- - ${TALER_DB_PORT:-8888}:5432
+ - ${TALER_DB_PORT}:5432
volumes:
- talerlogs:/logs
- talerdata:/var/lib/postgresql/data/
@@ -30,12 +31,13 @@ services:
restart: always
exchange:
+ env_file: sandcastle-variables.env
build: ./images/exchange
image: sandcastle_exchange
depends_on:
- talerdb
ports:
- - ${TALER_EXCHANGE_PORT:-5555}:80
+ - ${TALER_EXCHANGE_PORT}:80
volumes:
- talerlogs:/logs
- talerdata:/data
@@ -43,17 +45,18 @@ services:
restart: always
merchant:
+ env_file: sandcastle-variables.env
build: ./images/merchant
image: sandcastle_merchant
depends_on:
- talerdb
ports:
- - ${TALER_MERCHANT_PORT:-5556}:80 # backend
- - ${TALER_BLOG_PORT:-5559}:8080 # blog
- - ${TALER_DONATIONS_PORT:-5560}:8081 # donations
- - ${TALER_SURVEY_PORT:-5561}:8082 # survey
- - ${TALER_LANDING_PORT:-5562}:8083 # landing
- - ${TALER_SYNC_PORT:-5563}:8084 # sync
+ - ${TALER_MERCHANT_PORT}:80 # backend
+ - ${TALER_BLOG_PORT}:8080 # blog
+ - ${TALER_DONATIONS_PORT}:8081 # donations
+ - ${TALER_SURVEY_PORT}:8082 # survey
+ - ${TALER_LANDING_PORT}:8083 # landing
+ - ${TALER_SYNC_PORT}:8084 # sync
volumes:
- talerlogs:/logs
- ${TALER_SANDCASTLE_CONFIG:-./config}:/config:ro
@@ -67,11 +70,12 @@ services:
restart: always
bank:
+ env_file: sandcastle-variables.env
build: ./images/libeufin
ports:
- - ${LIBEUFIN_SANDBOX_PORT:-15000}:15000 # Sandbox
- - ${LIBEUFIN_NEXUS_PORT:-15001}:15001 # Nexus
- - ${LIBEUFIN_FRONTEND_PORT:-15002}:80 # Nginx serving the SPA
+ - ${LIBEUFIN_SANDBOX_PORT}:15000 # Sandbox
+ - ${LIBEUFIN_NEXUS_PORT}:15001 # Nexus
+ - ${LIBEUFIN_FRONTEND_PORT}:80 # Nginx serving the SPA
volumes:
- talerlogs:/logs
- talerdata:/data
diff --git a/sandcastle/sandcastle-variables.env b/sandcastle/sandcastle-variables.env
new file mode 100644
index 0000000..a1ba29d
--- /dev/null
+++ b/sandcastle/sandcastle-variables.env
@@ -0,0 +1,14 @@
+TALER_DB_PORT=8888
+
+TALER_EXCHANGE_PORT=5555
+
+TALER_MERCHANT_PORT=5556
+TALER_BLOG_PORT=5559
+TALER_DONATIONS_PORT=5560
+TALER_SURVEY_PORT=5561
+TALER_LANDING_PORT=5562
+TALER_SYNC_PORT=5563
+
+LIBEUFIN_SANDBOX_PORT=15000
+LIBEUFIN_NEXUS_PORT=15001
+LIBEUFIN_FRONTEND_PORT=15002