From 0fa0c36743643180780c0eaf69adf2536dc5c9c9 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Thu, 4 Feb 2021 18:01:37 +0100 Subject: [PATCH] docker/l3d#90 Adjust node_cmd script to work with Traefik 2 --- bin/node_cmd | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/bin/node_cmd b/bin/node_cmd index e467a79..2f1ae07 100755 --- a/bin/node_cmd +++ b/bin/node_cmd @@ -8,6 +8,21 @@ ID=$(docker container ls --all -q -f name=^${NAME}$) if [[ -n ${ID} ]]; then docker start ${NAME} >/dev/null else + if [[ "$DOCKER4DRUPAL_TRAEFIK_USESSL" == "1" ]]; then + SCHEMA=https + if [[ "$DOCKER4DRUPAL_TRAEFIK_PORTS" == "443" ]]; then + PORT= + else + PORT=":$DOCKER4DRUPAL_TRAEFIK_PORTS" + fi + else + SCHEMA=http + if [[ "$DOCKER4DRUPAL_TRAEFIK_PORT" == "80" ]]; then + PORT= + else + PORT=":$DOCKER4DRUPAL_TRAEFIK_PORT" + fi + fi docker run --init -itd --name=${NAME} \ --network traefik_${COMPOSE_PROJECT_NAME} \ --network-alias bs \ @@ -16,10 +31,9 @@ else --label traefik.http.services.${COMPOSE_PROJECT_NAME}_bs.loadbalancer.server.port=3000 \ --label traefik.http.routers.${COMPOSE_PROJECT_NAME}_bs.rule=Host\(\`bs-${COMPOSE_PROJECT_NAME}.${DOCKER4DRUPAL_TRAEFIK_DOMAIN}\`\) \ --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \ - --env DOCKER4DRUPAL_TRAEFIK_PORT=${DOCKER4DRUPAL_TRAEFIK_PORT} \ - --env DOCKER4DRUPAL_TRAEFIK_PORTS=${DOCKER4DRUPAL_TRAEFIK_PORTS} \ - --env DOCKER4DRUPAL_TRAEFIK_USESSL=${DOCKER4DRUPAL_TRAEFIK_USESSL} \ - --env DOCKER4DRUPAL_TRAEFIK_DOMAIN=${DOCKER4DRUPAL_TRAEFIK_DOMAIN} \ + --env DOCKER4DRUPAL_NODE_DOMAIN=${COMPOSE_PROJECT_NAME}.${DOCKER4DRUPAL_TRAEFIK_DOMAIN} \ + --env DOCKER4DRUPAL_NODE_PORT=${PORT} \ + --env DOCKER4DRUPAL_NODE_SCHEMA=${SCHEMA} \ --expose 3000 \ -v $(php /usr/local/bin/volume.php) \ -w ${PWD} \ -- GitLab