Upgrading Compose version to 2

Accenture · Mar 2, 2017 · 36842f1 · 36842f1
1 parent 3b485a0
commit 36842f1
Show file tree

Hide file tree

Showing 6 changed files with 759 additions and 646 deletions.
diff --git a/compose/elk.yml b/compose/elk.yml
@@ -1,36 +1,49 @@
-# set CUSTOM_NETWORK_NAME to the name of the custom Docker network
+version: '2'
 
-elasticsearch:
-  container_name: elasticsearch
-  restart: always
-  image: elasticsearch:2.1.1
-  net: ${CUSTOM_NETWORK_NAME}
-  command: elasticsearch -Des.network.host=0.0.0.0
-  ports:
-    - "9200:9200"
-  volumes:
-    - elasticsearch_data:/usr/share/elasticsearch/data
+services:
+    elasticsearch:
+      container_name: elasticsearch
+      restart: always
+      image: elasticsearch:2.1.1
+      networks:
+        - backbone
+      command: elasticsearch -Des.network.host=0.0.0.0
+      ports:
+        - "9200:9200"
+      volumes:
+        - elasticsearch_data:/usr/share/elasticsearch/data
 
-logstash:
-  container_name: logstash
-  restart: always
-  image: accenture/adop-logstash:0.1.0
-  net: ${CUSTOM_NETWORK_NAME}
-  environment:
-    - "constraint:tier==public"
-    - LS_HEAP_SIZE=1024m
-  ports:
-    - "12201:12201/udp"
-    - "25826:25826/udp"
-    - "5000:5000/tcp"
+    logstash:
+      container_name: logstash
+      restart: always
+      image: accenture/adop-logstash:0.1.0
+      networks:
+        - backbone
+      environment:
+        - "constraint:tier==public"
+        - LS_HEAP_SIZE=1024m
+      ports:
+        - "12201:12201/udp"
+        - "25826:25826/udp"
+        - "5000:5000/tcp"
 
-kibana:
-  container_name: kibana
-  restart: always
-  image: kibana:4.3.1
-  net: ${CUSTOM_NETWORK_NAME}
-  command: kibana
-  environment:
-    - ELASTICSEARCH_URL=http://elasticsearch:9200
-  ports:
-    - "5601:5601"
+    kibana:
+      container_name: kibana
+      restart: always
+      image: kibana:4.3.1
+      networks:
+        - backbone
+      command: kibana
+      environment:
+        - ELASTICSEARCH_URL=http://elasticsearch:9200
+      ports:
+        - "5601:5601"
+
+networks:
+    backbone:
+      external:
+        name: ${CUSTOM_NETWORK_NAME}
+
+volumes:
+    elasticsearch_data:
+        driver: local