Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master

2016-10-17 14:09:09 -07:00 · 2016-10-17 14:09:09 -07:00 · 14716bc2da
commit 14716bc2da
parent a5c1e4b0cd bdcce13f4a
9 changed files with 217 additions and 10 deletions
--- a/tests/fixtures/networks/network-label.yml
+++ b/tests/fixtures/networks/network-label.yml
@ -0,0 +1,13 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    networks:
+      - network_with_label
+
+networks:
+  network_with_label:
+    labels:
+      - "label_key=label_val"
--- a/tests/fixtures/volumes/volume-label.yml
+++ b/tests/fixtures/volumes/volume-label.yml
@ -0,0 +1,13 @@
+version: "2.1"
+
+services:
+  web:
+    image: busybox
+    command: top
+    volumes:
+      - volume_with_label:/data
+
+volumes:
+  volume_with_label:
+    labels:
+      - "label_key=label_val"