Use external ports env

Decouple internal and exposed ports

Related PR(s):
* https://git.speag.com/oSparc/osparc-ops-deployment-configuration/-/merge_requests/1406

Author: YuryHrytsuk

services/simcore/docker-compose.deploy.master.yml

@@ -35,7 +35,7 @@ services:
       - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
       - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
       - "--entryPoints.postgres.address=:5432"
-      - "--entryPoints.redis.address=:${REDIS_PORT}"
+      - "--entryPoints.redis.address=:${REDIS_EXTERNAL_PORT}"
       - "--entryPoints.simcore_api.address=:10081"
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
       - "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
@@ -70,7 +70,7 @@ services:
         - traefik.tcp.routers.${SWARM_STACK_NAME}_redisRoute.entrypoints=redis
         - traefik.tcp.routers.${SWARM_STACK_NAME}_redisRoute.tls=false
         - traefik.tcp.routers.${SWARM_STACK_NAME}_redisRoute.service=${SWARM_STACK_NAME}_redisRoute
-        - traefik.tcp.services.${SWARM_STACK_NAME}_redisRoute.loadbalancer.server.port=${REDIS_PORT}
+        - traefik.tcp.services.${SWARM_STACK_NAME}_redisRoute.loadbalancer.server.port=${REDIS_EXTERNAL_PORT}
         - "traefik.tcp.routers.${SWARM_STACK_NAME}_redisRoute.rule=HostSNI(`*`)"
 
   clusters-keeper:

services/traefik/docker-compose.master.yml

@@ -23,8 +23,8 @@ services:
             - "--entryPoints.https.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
             - "--entryPoints.https.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
             - "--entryPoints.postgres.address=:5432"
-            - "--entryPoints.rabbitmq.address=:${RABBIT_PORT}"
-            - "--entryPoints.redis.address=:${REDIS_PORT}"
+            - "--entryPoints.rabbitmq.address=:${RABBIT_EXTERNAL_PORT}"
+            - "--entryPoints.redis.address=:${REDIS_EXTERNAL_PORT}"
             - "--entryPoints.smtp.address=:25"
             - "--providers.swarm.endpoint=unix:///var/run/docker.sock"
             - "--providers.swarm.exposedByDefault=false"
@@ -38,11 +38,11 @@ services:
             - "--providers.file.directory=/etc/traefik/"
             - "--providers.file.watch=true"
         ports:
-            - target: ${RABBIT_PORT}
-              published: ${RABBIT_PORT}
+            - target: ${RABBIT_EXTERNAL_PORT}
+              published: ${RABBIT_EXTERNAL_PORT}
               mode: host
-            - target: ${REDIS_PORT}
-              published: ${REDIS_PORT}
+            - target: ${REDIS_EXTERNAL_PORT}
+              published: ${REDIS_EXTERNAL_PORT}
               mode: host
         env_file:
             - .env

services/traefik/template.env

@@ -44,5 +44,5 @@ TRAEFIK_DOMAINS_REDIRECT_FROM=${TRAEFIK_DOMAINS_REDIRECT_FROM}
 TRAEFIK_DOMAINS_REDIRECT_TO=${TRAEFIK_DOMAINS_REDIRECT_TO}
 TRAEFIK_DOMAINS_REDIRECT_IS_PERMANENT=${TRAEFIK_DOMAINS_REDIRECT_IS_PERMANENT}
 
-REDIS_PORT=${REDIS_PORT}
-RABBIT_PORT=${RABBIT_PORT}
+REDIS_EXTERNAL_PORT=${REDIS_EXTERNAL_PORT}
+RABBIT_EXTERNAL_PORT=${RABBIT_EXTERNAL_PORT}