From 589bb95ba49a3d54b0047fe2173c466e0c63be20 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 3 Feb 2019 20:55:22 +0100
Subject: [PATCH] #22 Add support for browsersync in the node container #23
Remove redunant code in node and npm
---
bin/node | 9 +--------
bin/node_cmd | 24 ++++++++++++++++++++++++
bin/npm | 9 +--------
3 files changed, 26 insertions(+), 16 deletions(-)
create mode 100755 bin/node_cmd
diff --git a/bin/node b/bin/node
index 4b9cc60..a913a06 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 0000000..6768e7f
--- /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 68bc247..0b12d29 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 $@
--
GitLab