diff --git a/bin/node b/bin/node index 4b9cc60cc80d1dde309ecd9de59dfdda64560883..a913a06c1de13e4b227b4880f07e218aa3f829c9 100755 --- a/bin/node +++ b/bin/node @@ -1,10 +1,3 @@ #!/bin/bash -NAME=${COMPOSE_PROJECT_NAME}_l3d_node -ID=$(docker container ls --all -q -f name=^${NAME}$) -if [[ -n ${ID} ]]; then - docker start ${NAME} >/dev/null -else - docker run --init -itd --name=${NAME} -v $(php /usr/local/bin/volume.php) -w ${PWD} registry.lakedrops.com/docker/node:8-jessie-slim >/dev/null -fi -docker exec -it -w ${PWD} ${NAME} node $@ +NODE_CMD=node node_cmd $@ diff --git a/bin/node_cmd b/bin/node_cmd new file mode 100755 index 0000000000000000000000000000000000000000..6768e7f658ef031af0e04f2d629f65568dfc52f7 --- /dev/null +++ b/bin/node_cmd @@ -0,0 +1,24 @@ +#!/bin/bash + +NAME=${COMPOSE_PROJECT_NAME}_l3d_node +ID=$(docker container ls --all -q -f name=^${NAME}$) +if [[ -n ${ID} ]]; then + docker start ${NAME} >/dev/null +else + docker run --init -itd --name=${NAME} \ + --network traefik_${COMPOSE_PROJECT_NAME} \ + --label traefik.backend=${NAME} \ + --label traefik.frontend.rule="Host:bs.${COMPOSE_PROJECT_NAME}.docker.localhost" \ + --label traefik.port=3000 \ + --label traefik.site.backend=${NAME} \ + --label traefik.site.frontend.rule="Host:bs.${COMPOSE_PROJECT_NAME}.docker.localhost" \ + --label traefik.site.port=3000 \ + --label traefik.ui.backend=ui-${NAME} \ + --label traefik.ui.frontend.rule="Host:bs-ui.${COMPOSE_PROJECT_NAME}.docker.localhost" \ + --label traefik.ui.port=3001 \ + --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \ + -v $(php /usr/local/bin/volume.php) \ + -w ${PWD} \ + registry.lakedrops.com/docker/node:8-jessie-slim >/dev/null +fi +docker exec -it -w ${PWD} ${NAME} ${NODE_CMD} $@ diff --git a/bin/npm b/bin/npm index 68bc247a9adb6e7ce995cf97c85912f6aebd939e..0b12d2917e64b05106b1b3cda3fcd6eeaeeec533 100755 --- a/bin/npm +++ b/bin/npm @@ -1,10 +1,3 @@ #!/bin/bash -NAME=${COMPOSE_PROJECT_NAME}_l3d_node -ID=$(docker container ls --all -q -f name=^${NAME}$) -if [[ -n ${ID} ]]; then - docker start ${NAME} >/dev/null -else - docker run --init -itd --name=${NAME} -v $(php /usr/local/bin/volume.php) -w ${PWD} registry.lakedrops.com/docker/node:8-jessie-slim >/dev/null -fi -docker exec -it -w ${PWD} ${NAME} npm $@ +NODE_CMD=npm node_cmd $@