rename stacks to separe host and user worlds

stack/User.mk

@@ -0,0 +1,3 @@
+# target user: Fire ssh-add
+.PHONY: User user
+User user: bootstrap-docker docker-network-create $(if $(DOCKER_RUN),stack-User-up) ssh-add

stack/base.mk

@@ -1,3 +0,0 @@
-# target base: Fire ssh-add
-.PHONY: base
-base: $(if $(DOCKER_RUN),bootstrap-docker docker-network-create stack-base-up) ssh-add

stack/node.mk

@@ -1,5 +1,5 @@
 ENV_VARS += DOCKER_HOST_IFACE DOCKER_HOST_INET
 
-# target node: Fire docker-network-create-% for DOCKER_NETWORK_PUBLIC ssl-certs stack-node-up
+# target node: Fire docker-network-create-% for DOCKER_NETWORK_PUBLIC node-ssl-certs stack-node-up
 .PHONY: node
-node: bootstrap-docker docker-network-create-$(DOCKER_NETWORK_PUBLIC) ssl-certs stack-node-up
+node: bootstrap-docker docker-network-create-$(DOCKER_NETWORK_PUBLIC) node-ssl-certs stack-node-up

stack/node/node.yml

@@ -88,7 +88,7 @@ services:
       context: ../..
       dockerfile: docker/registrator/Dockerfile
     image: ${DOCKER_REPOSITORY_NODE}/registrator:${DOCKER_IMAGE_TAG}
-    command: -internal -cleanup -deregister always -resync=30 -useIpFromNetwork node -useIpFromLabel SERVICE_ADDRESS consul://consul:8500
+    command: -internal -cleanup -deregister always -resync=30 -useIpFromNetwork "${DOCKER_NETWORK_PUBLIC}" -useIpFromLabel SERVICE_ADDRESS consul://consul:8500
     depends_on:
     - consul
     environment: