From 10c5d9e7494ad1379e7d8a5d1b0400790061441c Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 18 May 2016 14:11:11 -0400 Subject: [PATCH 1/4] Add docker_service and mention ansible-container. --- docsite/rst/guide_docker.rst | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/docsite/rst/guide_docker.rst b/docsite/rst/guide_docker.rst index 88d39ad0a58..3ff363332dc 100644 --- a/docsite/rst/guide_docker.rst +++ b/docsite/rst/guide_docker.rst @@ -3,6 +3,10 @@ Getting Started with Docker Ansible offers the following modules for orchestrating Docker containers: + docker_service + Use your existing Docker compose files to orchestrate containers on a single Docker daemon or on + Swarm. Supports compose versions 1 and 2. + docker_container Manages the container lifecycle by providing the ability to create, update, stop, start and destroy a container. @@ -23,10 +27,17 @@ Ansible offers the following modules for orchestrating Docker containers: Ansible 2.1.0 includes major updates to the Docker modules, marking the start of a project to create a complete and -integrated set of tools for orchestrating containers. The docker_image and docker_login modules as well as the dynamic -inventory script were refactored to use a common set of parameters and environment variables for shaping Docker API -connections. The docker_container and docker_image_facts modules are new. +integrated set of tools for orchestrating containers. In addition to the above modules, we are also working on the +following: + +Still using Dockerfile to build images? Check out `ansible-container `_, +and start building images from your Ansible playbooks. +Use the 'shipit' command in `ansible-container `_ +to launch your docker-compose file on `OpenShift `_. Go from an app on your laptop to a fully +scalable app in the cloud in just a few moments. + +There's more planned. See the latest ideas and thinking at the `Ansbile proposal repo `_. Requirements ------------ @@ -38,13 +49,19 @@ installed on the host running Ansible. You will need to have >= 1.7.0 installed. $ pip install docker-py>=1.7.0 +The docker_service module also requires `docker-compose `_ + +.. code-block:: bash + + $ pip install docker-compose>=1.7.0 + Connecting to the Docker API ---------------------------- You can connect to a local or remote API using parameters passed to each task or by setting environment variables. The order of precedence is command line parameters and then environment variables. If neither a command line -option for a environment variable is found, then a default value will be used. The default values are provided under +option or an environment variable is found, a default value will be used. The default values are provided under `Parameters`_ From 0c80b71d71a3ea9ac7e8129afee9c310c13c9021 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 18 May 2016 14:22:27 -0400 Subject: [PATCH 2/4] Fix italics and version directives. --- docsite/rst/guide_docker.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docsite/rst/guide_docker.rst b/docsite/rst/guide_docker.rst index 3ff363332dc..8775b226555 100644 --- a/docsite/rst/guide_docker.rst +++ b/docsite/rst/guide_docker.rst @@ -33,7 +33,7 @@ following: Still using Dockerfile to build images? Check out `ansible-container `_, and start building images from your Ansible playbooks. -Use the 'shipit' command in `ansible-container `_ +Use the *shipit* command in `ansible-container `_ to launch your docker-compose file on `OpenShift `_. Go from an app on your laptop to a fully scalable app in the cloud in just a few moments. @@ -47,13 +47,13 @@ installed on the host running Ansible. You will need to have >= 1.7.0 installed. .. code-block:: bash - $ pip install docker-py>=1.7.0 + $ pip install 'docker-py>=1.7.0' The docker_service module also requires `docker-compose `_ .. code-block:: bash - $ pip install docker-compose>=1.7.0 + $ pip install 'docker-compose>=1.7.0' Connecting to the Docker API From 22de8a9a216ff38957fa60925f5521189e6877e9 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 18 May 2016 14:31:50 -0400 Subject: [PATCH 3/4] Update ansible-container links. --- docsite/rst/guide_docker.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docsite/rst/guide_docker.rst b/docsite/rst/guide_docker.rst index 8775b226555..80b01976ba2 100644 --- a/docsite/rst/guide_docker.rst +++ b/docsite/rst/guide_docker.rst @@ -30,10 +30,10 @@ Ansible 2.1.0 includes major updates to the Docker modules, marking the start of integrated set of tools for orchestrating containers. In addition to the above modules, we are also working on the following: -Still using Dockerfile to build images? Check out `ansible-container `_, +Still using Dockerfile to build images? Check out `ansible-container `_, and start building images from your Ansible playbooks. -Use the *shipit* command in `ansible-container `_ +Use the *shipit* command in `ansible-container `_ to launch your docker-compose file on `OpenShift `_. Go from an app on your laptop to a fully scalable app in the cloud in just a few moments. From 0bc23a44080e9266b05c6bbdb4c00bcdb6c6d8ea Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 18 May 2016 14:57:06 -0400 Subject: [PATCH 4/4] Fix typo. --- docsite/rst/guide_docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsite/rst/guide_docker.rst b/docsite/rst/guide_docker.rst index 80b01976ba2..552db63e45f 100644 --- a/docsite/rst/guide_docker.rst +++ b/docsite/rst/guide_docker.rst @@ -37,7 +37,7 @@ Use the *shipit* command in `ansible-container `_. Go from an app on your laptop to a fully scalable app in the cloud in just a few moments. -There's more planned. See the latest ideas and thinking at the `Ansbile proposal repo `_. +There's more planned. See the latest ideas and thinking at the `Ansible proposal repo `_. Requirements ------------