From 318795c0f83113e9a4bc92856feea277ae390903 Mon Sep 17 00:00:00 2001
From: Josh Cox <josh@webhosting.coop>
Date: Wed, 2 Aug 2017 13:24:25 -0500
Subject: [PATCH] Rawmind0 fixes

---
 .../0/docker-compose.yml.tpl                  | 115 ++++++++++++++----
 .../rabbitmq-examples/0/rancher-compose.yml   |  18 +--
 2 files changed, 94 insertions(+), 39 deletions(-)

diff --git a/templates/rabbitmq-examples/0/docker-compose.yml.tpl b/templates/rabbitmq-examples/0/docker-compose.yml.tpl
index d79e46e..d177fd3 100644
--- a/templates/rabbitmq-examples/0/docker-compose.yml.tpl
+++ b/templates/rabbitmq-examples/0/docker-compose.yml.tpl
@@ -5,20 +5,27 @@ services:
     hostname: rabbit
     image: rabbitmq:3
 {{- end}}
+
   receive:
     command: receive
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: send
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
   send:
     image: joshuacox/rabbitmq-tutorials
     labels:
@@ -27,27 +34,38 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: send
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
 
   worker:
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: newtask
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
     command: worker
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
   newtask:
     image: joshuacox/rabbitmq-tutorials
@@ -57,27 +75,38 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: new_task
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
 
   rpcserver:
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: rpcclient
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
     command: rpc_server
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
   rpcclient:
     image: joshuacox/rabbitmq-tutorials
@@ -87,27 +116,38 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: rpc_client 4
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
 
   receivelogs:
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: emitlog
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
     command: receive_logs
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
   emitlog:
     image: joshuacox/rabbitmq-tutorials
@@ -117,27 +157,38 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: emit_log
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
 
   receivelogsdirect:
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: emitlogdirect
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
     command: receive_logs_direct info
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
   emitlogdirect:
     image: joshuacox/rabbitmq-tutorials
@@ -147,27 +198,38 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: emit_log_direct
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
 
   receivelogstopic:
     image: joshuacox/rabbitmq-tutorials
     labels:
       io.rancher.container.hostname_override: container_name
+      io.rancher.sidekicks: emitlogtopic
 {{- if ne .Values.host_label ""}}
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
-    environment:
-      - AMQ_HOST=rabbit
     command: receive_logs_topic anonymous.info
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
   emitlogtopic:
     image: joshuacox/rabbitmq-tutorials
@@ -177,10 +239,15 @@ services:
       io.rancher.scheduler.affinity:host_label: ${host_label}
 {{- end}}
       io.rancher.container.start_once: true
-    environment:
-      - AMQ_HOST=rabbit
     command: emit_log_topic
 {{- if ne .Values.rabbitmq_link ""}}
     external_links:
       - ${rabbitmq_link}:rabbit
+    environment:
+      - AMQ_HOST=rabbit.rancher.internal
+{{- else}}
+    links:
+      - rabbit
+    environment:
+      - AMQ_HOST=rabbit
 {{- end}}
diff --git a/templates/rabbitmq-examples/0/rancher-compose.yml b/templates/rabbitmq-examples/0/rancher-compose.yml
index ddf309a..8d73300 100644
--- a/templates/rabbitmq-examples/0/rancher-compose.yml
+++ b/templates/rabbitmq-examples/0/rancher-compose.yml
@@ -20,25 +20,13 @@ catalog:
 services:
   receive:
     scale: 1
-  send:
-    scale: 1
-  worker:
-    scale: 1
-  newtask:
-    scale: 1
-  rpcserver:
-    scale: 1
-  rpcclient:
-    scale: 1
   receivelogs:
     scale: 1
-  emitlog:
-    scale: 1
   receivelogsdirect:
     scale: 1
-  emitlogdirect:
-    scale: 1
   receivelogstopic:
     scale: 1
-  emitlogtopic:
+  rpcserver:
+    scale: 1
+  worker:
     scale: 1