Add login to private docker registry.
diff --git a/README.rst b/README.rst
index 111fa88..b2bf63e 100644
--- a/README.rst
+++ b/README.rst
@@ -86,6 +86,23 @@
to:
- name@receivehost.com
+Docker login to private registry
+--------------------------------
+
+.. code-block:: yaml
+
+ docker:
+ host:
+ enabled: true
+ registry:
+ first:
+ address: private.docker.com
+ user: username
+ password: password
+ second:
+ address: private2.docker.com
+ user: username2
+ password: password2
Read more
---------
diff --git a/docker/host.sls b/docker/host.sls
index d9846ea..e492749 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -53,5 +53,17 @@
- reload_modules: True
{% endif %}
+{%- if host.registry is defined %}
+
+{%- for name,registry in host.registry.iteritems() %}
+
+docker_{{ registry.address }}_login:
+ cmd.run:
+ - name: 'docker login -u {{ registry.user }} -p {{ registry.password }} {{ registry.address }}'
+ - unless: grep {{ registry.address }} /root/.docker/config.json
+
+{%- endfor %}
+
+{%- endif %}
{%- endif %}
\ No newline at end of file
diff --git a/docker/map.jinja b/docker/map.jinja
index f1e875b..f228e3e 100644
--- a/docker/map.jinja
+++ b/docker/map.jinja
@@ -19,7 +19,7 @@
'install_docker_py': False
},
'Ubuntu': {
- 'pkgs': ['docker-engine'],
+ 'pkgs': ['docker-engine', 'python-docker'],
'service': 'docker',
'container': {},
'install_docker_py': False