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.

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

Remove molecule container building from core #2935

Merged
merged 2 commits into from
Oct 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ jobs:
- tox_env: packaging
- tox_env: eco
- tox_env: dockerfile
- tox_env: build-containers
needs:
- dockerfile
- docs
- lint
- packaging
- py36
- py37
- py38

steps:
- uses: actions/checkout@v1
Expand Down
192 changes: 0 additions & 192 deletions Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,6 @@ Generate the documentation, using `sphinx`_.

.. _`sphinx`: http://www.sphinx-doc.org

Build container images
----------------------

Build the container images with docker or podman.

.. code-block:: bash

$ tox -e build-containers

Documentation
=============

Expand Down
24 changes: 6 additions & 18 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,15 @@ Common Molecule Use Cases

.. _docker-usage-example:

Docker
======
Running inside a container
==========================

Molecule can be executed via an Alpine Linux container by bind-mounting the
Docker socket. Currently, we only build images for the latest version
of Ansible and Molecule. In the future we may break this out into Molecule/
Ansible versioned pairs. The images are located on `quay.io`_.
The building of Molecule container is taken care of by molecule-dist_ project.

To test a role, change directory into the role to test, and execute Molecule as
follows.
Any questions or bugs related to use of molecule, from within a container,
should be addressed by that standalone project.

.. code-block:: bash

docker run --rm -it \
-v "$(pwd)":/tmp/$(basename "${PWD}"):ro \
-v /var/run/docker.sock:/var/run/docker.sock \
-w /tmp/$(basename "${PWD}") \
quay.io/ansible/molecule:3.0.8 \
molecule test

.. _`quay.io`: https://quay.io/repository/ansible/molecule
.. _`molecule-dist`: https://github.com/ansible-community/molecule-dist

Docker With Non-Privileged User
===============================
Expand Down
72 changes: 0 additions & 72 deletions tools/build-containers.py

This file was deleted.

19 changes: 0 additions & 19 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,6 @@ extras =
docker
selinux

[testenv:build-containers]
description = Builds and eventually publishes molecule container will all plugins
# skip under Windows
platform = ^darwin|^linux
# `usedevelop = True` overrided `skip_install` instruction, it's unwanted
usedevelop = False
# don't install Molecule in this env
skip_install = True
# don't install any Python dist deps
deps =
setuptools_scm==3.3.3
packaging # pyup: ignore
# reset pre-commands
commands_pre =
commands =
python ./tools/build-containers.py
allowlist_externals =
sh

[testenv:packaging]
description =
Do packaging/distribution. If tag is not present or PEP440 compliant upload to
Expand Down