diff --git a/bin/backstop b/bin/backstop index e42eec01787344af507ce4dc98ad073734e5e627..510396bc64767357eeba9f96ebf69f1792e9afe6 100755 --- a/bin/backstop +++ b/bin/backstop @@ -2,7 +2,7 @@ export $(cat .env | xargs) cd tests/backstop -docker run --rm -t -v $(php /usr/local/bin/volume.php) -w $PWD --network=traefik_${COMPOSE_PROJECT_NAME} backstopjs/backstopjs "$@" +docker run --rm -t -v $(php /usr/local/bin/volume.php) -w $PWD --network=traefik-public backstopjs/backstopjs "$@" EC=$? exit $EC diff --git a/bin/node_cmd b/bin/node_cmd index a7e87a238c9977c42e6a19212a4aa3998ce4a3f3..26499cba632b35624d6fb4de80ebba4be1fe068d 100755 --- a/bin/node_cmd +++ b/bin/node_cmd @@ -26,17 +26,17 @@ else PORT=":$DOCKER4DRUPAL_TRAEFIK_PORT" fi fi - NETWORK="--network traefik_${COMPOSE_PROJECT_NAME} --network-alias bs" - ID=$(docker network ls -q -f name=^traefik_${COMPOSE_PROJECT_NAME}$) + NETWORK="--network traefik-public --network-alias bs" + ID=$(docker network ls -q -f name=^traefik-public$) if [[ "x${ID}" == "x" ]]; then NETWORK="" fi docker run -u $(id -u) --init -it --rm --name=${NAME} \ ${NETWORK} \ --label traefik.enable=True \ - --label traefik.network=${COMPOSE_PROJECT_NAME} \ + --label traefik.docker.network=traefik-public \ --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}\`\) \ + --label traefik.http.routers.bs-${COMPOSE_PROJECT_NAME}.rule=Host\(\`bs-${COMPOSE_PROJECT_NAME}.${DOCKER4DRUPAL_TRAEFIK_DOMAIN}\`\) \ --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \ --env DOCKER4DRUPAL_NODE_DOMAIN=${COMPOSE_PROJECT_NAME}.${DOCKER4DRUPAL_TRAEFIK_DOMAIN} \ --env DOCKER4DRUPAL_NODE_PORT=${PORT} \