Removed distribute=true

integration_tests/integration_swarm_test.go

@@ -811,7 +811,6 @@ func (s *IntegrationSwarmTestSuite) createGoDemoService() {
     --network go-demo \
     --network proxy \
     --label com.df.notify=true \
-    --label com.df.distribute=true \
     --label com.df.servicePath=/demo \
     --label com.df.port=8080 \
     vfarcic/go-demo:no-health`

issues/411/stack.yml

@@ -29,7 +29,6 @@ services:
         delay: 10s
       labels:
         - com.df.notify=true
-        - com.df.distribute=true
         - com.df.servicePath=/demo
         - com.df.port=8080
 

issues/README.md

@@ -1,63 +1,17 @@
 ```bash
-####################
-# Create a cluster #
-####################
+docker network create -d overlay proxy
 
-curl -o swarm-cluster.sh \
-    https://raw.githubusercontent.com/vfarcic/docker-flow-proxy/master/scripts/swarm-cluster.sh
+docker stack deploy -c stack.yml test
 
-chmod +x swarm-cluster.sh
+# DFP > jboss
 
-./swarm-cluster.sh
+open "http://localhost"
 
-docker-machine ssh node-1
+# DFP > tomcat
 
-##############
-# Deploy DFP #
-##############
+curl -i "http://localhost/tomcat"
 
-docker network create --driver overlay proxy
+# tomcat
 
-curl -o docker-compose-stack.yml \
-    https://raw.githubusercontent.com/\
-vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
-
-docker stack deploy -c docker-compose-stack.yml proxy
-
-docker stack ps proxy
-
-# Remember the node of one of the machines where DFP is running (e.g. node-3)
-
-#########################
-# Deploy a demo service #
-#########################
-
-curl -o docker-compose-go-demo.yml \
-    https://raw.githubusercontent.com/\
-vfarcic/go-demo/master/docker-compose-stack.yml
-
-docker stack deploy -c docker-compose-go-demo.yml go-demo
-
-docker stack ps go-demo # Wait until all the replicas are running
-
-########
-# Test #
-########
-
-exit
-
-curl -i "$(docker-machine ip node-1)/demo/hello"
-
-docker-machine rm -f node-3 # Replace node-3 with the node where a DFP replica is running
-
-curl -i "$(docker-machine ip node-1)/demo/hello"
-
-# It might take a while until Swarm detects that a node is down.
-# After a while, curl should respond fast.
-
-###########
-# Cleanup #
-###########
-
-docker-machine rm -f $(docker-machine ls -q)
+open "http://localhost:8080"
 ```

issues/stack.yml

@@ -0,0 +1,60 @@
+version: "3"
+services:
+
+  jboss:
+    image: jboss/wildfly
+    networks:
+      - proxy
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+        delay: 10s
+      labels:
+        - com.df.notify=true
+        - com.df.servicePath=/
+        - com.df.port=8080
+
+  tomcat:
+    image: tomcat:8.0
+    networks:
+      - proxy
+    ports:
+      - 8080:8080 # New
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+        delay: 10s
+      labels:
+        - com.df.notify=true
+        - com.df.servicePath=/tomcat
+        - com.df.reqPathSearchReplace=/tomcat,/
+        - com.df.port=8080
+
+  proxy:
+    image: vfarcic/docker-flow-proxy
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      - proxy
+    environment:
+      - LISTENER_ADDRESS=swarm-listener
+
+  swarm-listener:
+    image: vfarcic/docker-flow-swarm-listener
+    networks:
+      - proxy
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - DF_NOTIFY_CREATE_SERVICE_URL=http://proxy:8080/v1/docker-flow-proxy/reconfigure
+      - DF_NOTIFY_REMOVE_SERVICE_URL=http://proxy:8080/v1/docker-flow-proxy/remove
+    deploy:
+      placement:
+        constraints: [node.role == manager]
+
+networks:
+  proxy:
+    external: true

scripts/swarm-services.sh

@@ -32,7 +32,6 @@ docker service create --name go-demo \
     --network go-demo \
     --network proxy \
     --label com.df.notify=true \
-    --label com.df.distribute=true \
     --label com.df.servicePath=/demo \
     --label com.df.port=8080 \
     --replicas 3 \

stack.yml

@@ -18,7 +18,6 @@ services:
     deploy:
       labels:
         - com.df.notify=true
-        - com.df.distribute=true
         - com.df.alertName=memlimit
         - com.df.alertIf=@service_mem_limit:0.8
         - com.df.alertFor=30s
@@ -38,7 +37,6 @@ services:
       - proxy
     deploy:
       labels:
-        - com.df.distribute=true
         - com.df.notify=true
         - com.df.reschedule=true
         - com.df.port=80
@@ -72,7 +70,6 @@ services:
       labels:
         - com.df.servicePath=/.well-known/acme-challenge
         - com.df.notify=true
-        - com.df.distribute=true
         - com.df.port=80
       resources:
         reservations: