Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Document use of newer toolset container image #3059

Merged
merged 1 commit into from
Mar 5, 2021
Merged

Document use of newer toolset container image #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions docs/ci.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
9 changes: 4 additions & 5 deletions docs/examples.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
===============================
Expand Down
14 changes: 4 additions & 10 deletions docs/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
======
Expand Down