saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2018.3' into 2018.3

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-06-12 14:59:38 -06:00 • committed by GitHub
commit 914935c4d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/topics/releases/2018.3.0.rst
View file

@ -45,8 +45,8 @@ Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6 networks
are supported. See :ref:`here <salt-states-docker-network-present-ipam>` for
more information.
Network Configuration in :py:func:`docker_container.running` States
*******************************************************************
Network Configuration in :py:func:`docker_container.running <salt.states.docker_container.running>` States
**********************************************************************************************************
A long-requested feature has finally been added! It is now possible to
configure static IPv4/IPv6 addresses, as well as links and labels. See
@ -54,9 +54,10 @@ configure static IPv4/IPv6 addresses, as well as links and labels. See
information.
.. note::
While the ``containers`` argument to :py:func:`docker_network.present`
will continue to be supported, it will no longer be the recommended way of
ensuring that a container is attached to a network.
While the ``containers`` argument to :py:func:`docker_network.present
<salt.states.docker_network.present>` will continue to be supported, it
will no longer be the recommended way of ensuring that a container is
attached to a network.
Improved Handling of Images from Custom Registries
**************************************************