Skip to content

Commit efe668c

Browse files
committed
Invitation entrypoints for all FQDNs
1 parent 432ed46 commit efe668c

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

scripts/common.Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,22 @@ export DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL=$(shell set -o allexport;
7474
echo $$DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL; \
7575
set +o allexport; )
7676
77+
export DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS=$(shell set -o allexport; \
78+
source $(REPO_CONFIG_LOCATION); \
79+
if [ -z "$${DEPLOYMENT_FQDNS}" ]; then \
80+
DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS="(Host(\`invitations.${MACHINE_FQDN}\`))"; \
81+
else \
82+
IFS=', ' read -r -a hosts <<< "$${DEPLOYMENT_FQDNS}"; \
83+
DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS="(Host(\`invitations.${MACHINE_FQDN}\`))"; \
84+
for element in "$${hosts[@]}"; \
85+
do \
86+
DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS="$$DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS || (Host(\`invitations.$$element\`))";\
87+
done; \
88+
DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS="$$DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS"; \
89+
fi; \
90+
echo $$DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS; \
91+
set +o allexport; )
92+
7793
export DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_MAINTENANCE_PAGE=$(shell set -o allexport; \
7894
source $(REPO_CONFIG_LOCATION); \
7995
if [ -z "$${DEPLOYMENT_FQDNS}" ]; then \

services/simcore/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ services:
165165
- traefik.enable=true
166166
- io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
167167
- traefik.http.routers.${SWARM_STACK_NAME}_invitations.service=${SWARM_STACK_NAME}_invitations
168-
- traefik.http.routers.${SWARM_STACK_NAME}_invitations.rule=Host(`invitations.${MACHINE_FQDN}`)
168+
- traefik.http.routers.${SWARM_STACK_NAME}_invitations.rule=(${DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS})
169169
- traefik.http.routers.${SWARM_STACK_NAME}_invitations.entrypoints=http
170170
- traefik.http.routers.${SWARM_STACK_NAME}_invitations.priority=1
171171
- traefik.http.services.${SWARM_STACK_NAME}_invitations.loadbalancer.server.port=8000

0 commit comments

Comments
 (0)