diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 0a4f1d995d..bb085a501a 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -141,5 +141,3 @@ jobs: uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.pypi_password }} -# No need to publish to quay.io from here as they do it when a new tag -# is pushed on git. diff --git a/docs/ci.rst b/docs/ci.rst index 0db0e8a1bc..4c631d931a 100644 --- a/docs/ci.rst +++ b/docs/ci.rst @@ -225,14 +225,14 @@ Jenkins Pipeline } -The following `Jenkinsfile` uses the official 'quay.io/ansible/molecule' image. +The following `Jenkinsfile` uses the Toolset image. .. code-block:: groovy pipeline { agent { docker { - image 'quay.io/ansible/molecule' + image 'quay.io/ansible/toolset' args '-v /var/run/docker.sock:/var/run/docker.sock' } } diff --git a/docs/examples.rst b/docs/examples.rst index 0573db2a5b..f93ba02363 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -7,13 +7,12 @@ Common Molecule Use Cases Running inside a container ========================== -While molecule project itself does not build a container, we do recommend -you to use the `toolset`_ container, which also contains molecule. +Molecule is built into a Docker image by the `Toolset`_ project. -Any questions or bugs related to use of molecule from within a container, -should be addressed by the toolset project. +Any questions or bugs related to use of Molecule from within a container +should be addressed by the Toolset project. -.. _`toolset`: https://github.com/ansible-community/toolset +.. _`Toolset`: https://github.com/ansible-community/toolset Docker With Non-Privileged User =============================== diff --git a/docs/installation.rst b/docs/installation.rst index b3d16c48af..7b4cb4e828 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -135,18 +135,12 @@ some benefits: Docker ====== -We publish molecule images via `quay.io`_ where the following tags are available: +Molecule is built into a Docker image by the `Toolset`_ project. - * ``latest``: latest master branch build, which should be viewed as unstable - * ``2.20``: Git based tags - * ``2.20a1``: Pre-releases tags +Any questions or bugs related to use of Molecule from within a container +should be addressed by the Toolset project. -Please see the `tags listing`_ for available tags. - -Please see :ref:`docker-usage-example` for usage. - -.. _`quay.io`: https://quay.io/repository/ansible/molecule -.. _tags listing: https://quay.io/repository/ansible/molecule?tab=tags +.. _`Toolset`: https://github.com/ansible-community/toolset Source ======