Merge pull request #40805 from terminalmage/moby

Alias moby to docker in Nitrogen (and later)

doc/topics/releases/nitrogen.rst

@@ -347,6 +347,18 @@ This is similar to how Salt handles MySQL, MongoDB, Zabbix, and other cases
 where the same execution module is used to manage several different kinds
 of objects (users, databases, roles, etc.).
 
+.. note::
+    With the `Moby announcement`_ coming at this year's DockerCon_, Salt's
+    :mod:`docker <salt.modules.dockermod>` execution module (as well as the
+    state modules) work interchangably when **docker** is replaced with
+    **moby** (e.g.  :py:func:`moby_container.running
+    <salt.states.docker_container.running>`, :py:func:`moby_image.present
+    <salt.states.docker_image.present>`, :py:func:`moby.inspect_container
+    <salt.modules.dockermod.inspect_container>`, etc.)
+
+.. _`Moby announcement`: https://blog.docker.com/2017/04/introducing-the-moby-project/
+.. _DockerCon: http://2017.dockercon.com/
+
 The old syntax will continue to work until the **Fluorine** release of Salt.
 The old ``dockerng`` naming will also continue to work until that release, so
 no immediate changes need to be made to your SLS files (unless you were still

salt/modules/dockermod.py

@@ -255,7 +255,7 @@ NOTSET = object()
 
 # Define the module's virtual name and alias
 __virtualname__ = 'docker'
-__virtual_aliases__ = ('dockerng',)
+__virtual_aliases__ = ('dockerng', 'moby')
 
 
 def __virtual__():

salt/states/docker.py

@@ -67,7 +67,7 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 # Define the module's virtual name
 __virtualname__ = 'docker'
-__virtual_aliases__ = ('dockerng',)
+__virtual_aliases__ = ('dockerng', 'moby')
 
 
 def __virtual__():

salt/states/docker_container.py

@@ -60,6 +60,7 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 # Define the module's virtual name
 __virtualname__ = 'docker_container'
+__virtual_aliases__ = ('moby_container',)
 
 
 def __virtual__():

salt/states/docker_image.py

@@ -46,6 +46,7 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 # Define the module's virtual name
 __virtualname__ = 'docker_image'
+__virtual_aliases__ = ('moby_image',)
 
 
 def __virtual__():
@@ -102,7 +103,7 @@ def present(name,
                 - build: /home/myuser/docker/myimage
                 - dockerfile: Dockerfile.alternative
 
-            .. versionadded:: 2016.11.0
+        .. versionadded:: 2016.11.0
 
         The image will be built using :py:func:`docker.build
         <salt.modules.dockermod.build>` and the specified image name and tag

salt/states/docker_network.py

@@ -38,6 +38,7 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 # Define the module's virtual name
 __virtualname__ = 'docker_network'
+__virtual_aliases__ = ('moby_network',)
 
 
 def __virtual__():

salt/states/docker_volume.py

@@ -41,6 +41,7 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 # Define the module's virtual name
 __virtualname__ = 'docker_volume'
+__virtual_aliases__ = ('moby_volume',)
 
 
 def __virtual__():