Merge pull request #9 from kibatic/default_label

Add docker default global labels
kibatic · Dec 8, 2017 · 8dd34a3 · 8dd34a3
2 parents 9a050fe + 0afc423
commit 8dd34a3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,8 @@ default_volumes:
 container_data_home: '/home/cloud/containers'
 # Default options passed to docker run
 default_docker_options: ''
+# Default labels set on each container
+default_docker_labels: []
 # Default network name
 default_network_name: default_network
 # Units to be removed from system

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,5 +3,6 @@ default_volumes:
   - /etc/localtime:/etc/localtime:ro
 container_data_home: '/home/cloud/containers'
 default_docker_options: ''
+default_docker_labels: []
 default_network_name: default_network
 removed_units: []
diff --git a/templates/default.service.j2 b/templates/default.service.j2
@@ -57,6 +57,7 @@ ExecStart=/usr/bin/docker run {{ default_docker_options }}
 {%- endfor %}
 {%- endif %}
  {% if unit.labels is defined %}{% for label in unit.labels %}--label {{ label }} {% endfor %}{% endif %}
+ {% for label in default_docker_labels %}--label {{ label }} {% endfor %}
 {%- if unit.links is not defined %}
 {% set network = unit.network|default(default_network_name) %}
  --network={{ network }}

diff --git a/tests/goss-systemd.yaml b/tests/goss-systemd.yaml
@@ -30,6 +30,7 @@ file:
     contains: # Check file content for these patterns
       - "--add-host test:8.8.8.8"
       - "--volume /etc/localtime:/etc/localtime:ro"
+      - "--label fooLabel=barLabel"
   # Cover https://github.com/kibatic/docker-systemd/issues/3
   /lib/systemd/system/nginx-host.service:
     exists: true

diff --git a/tests/goss.yaml b/tests/goss.yaml
@@ -17,5 +17,6 @@ command:
     # optional attributes
     stdout:
       - "\"test_label\": \"foo1234\""
+      - "\"fooLabel\": \"barLabel\""
     stderr: []
     timeout: 10000 # in milliseconds
diff --git a/tests/units/nginx.yml b/tests/units/nginx.yml
@@ -20,3 +20,5 @@ systemd_units:
     network: host
 
 default_docker_options: '--add-host test:8.8.8.8'
+default_docker_labels:
+  - fooLabel=barLabel