From 4d60702051212bc89ab59d9122211209ac50179c Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sat, 18 May 2019 10:10:24 +0100 Subject: [PATCH] Updated Molecule to 2.20.1 (#62) Keeping up with the latest changes. --- .moleculew/molecule_version | 2 +- .yamllint | 2 -- molecule/centos/Dockerfile.j2 | 11 ++++++----- molecule/centos/INSTALL.rst | 12 +++++++++--- molecule/default/Dockerfile.j2 | 11 ++++++----- molecule/default/INSTALL.rst | 12 +++++++++--- molecule/fedora/Dockerfile.j2 | 11 ++++++----- molecule/fedora/INSTALL.rst | 12 +++++++++--- molecule/opensuse/Dockerfile.j2 | 11 ++++++----- molecule/opensuse/INSTALL.rst | 12 +++++++++--- molecule/python3/Dockerfile.j2 | 2 +- molecule/python3/INSTALL.rst | 16 ++++++---------- molecule/ubuntu-min/Dockerfile.j2 | 8 ++++---- molecule/ubuntu-min/INSTALL.rst | 16 ++++++---------- 14 files changed, 78 insertions(+), 60 deletions(-) diff --git a/.moleculew/molecule_version b/.moleculew/molecule_version index d76bd2b..4e2200b 100644 --- a/.moleculew/molecule_version +++ b/.moleculew/molecule_version @@ -1 +1 @@ -2.17.0 +2.20.1 diff --git a/.yamllint b/.yamllint index 77be3fb..ad0be76 100644 --- a/.yamllint +++ b/.yamllint @@ -8,6 +8,4 @@ rules: max-spaces-inside: 1 level: error line-length: disable - # NOTE(retr0h): Templates no longer fail this lint rule. - # Uncomment if running old Molecule templates. truthy: disable diff --git a/molecule/centos/Dockerfile.j2 b/molecule/centos/Dockerfile.j2 index 9f689d9..e6aa95d 100644 --- a/molecule/centos/Dockerfile.j2 +++ b/molecule/centos/Dockerfile.j2 @@ -6,8 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ + elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ + elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/centos/INSTALL.rst b/molecule/centos/INSTALL.rst index e26493b..6a44bde 100644 --- a/molecule/centos/INSTALL.rst +++ b/molecule/centos/INSTALL.rst @@ -1,16 +1,22 @@ ******* -Install +Docker driver installation guide ******* Requirements ============ * Docker Engine -* docker-py Install ======= +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + .. code-block:: bash - $ sudo pip install docker-py + $ pip install 'molecule[docker]' diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2 index 9f689d9..e6aa95d 100644 --- a/molecule/default/Dockerfile.j2 +++ b/molecule/default/Dockerfile.j2 @@ -6,8 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ + elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ + elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst index e26493b..6a44bde 100644 --- a/molecule/default/INSTALL.rst +++ b/molecule/default/INSTALL.rst @@ -1,16 +1,22 @@ ******* -Install +Docker driver installation guide ******* Requirements ============ * Docker Engine -* docker-py Install ======= +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + .. code-block:: bash - $ sudo pip install docker-py + $ pip install 'molecule[docker]' diff --git a/molecule/fedora/Dockerfile.j2 b/molecule/fedora/Dockerfile.j2 index 9f689d9..e6aa95d 100644 --- a/molecule/fedora/Dockerfile.j2 +++ b/molecule/fedora/Dockerfile.j2 @@ -6,8 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ + elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ + elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/fedora/INSTALL.rst b/molecule/fedora/INSTALL.rst index e26493b..6a44bde 100644 --- a/molecule/fedora/INSTALL.rst +++ b/molecule/fedora/INSTALL.rst @@ -1,16 +1,22 @@ ******* -Install +Docker driver installation guide ******* Requirements ============ * Docker Engine -* docker-py Install ======= +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + .. code-block:: bash - $ sudo pip install docker-py + $ pip install 'molecule[docker]' diff --git a/molecule/opensuse/Dockerfile.j2 b/molecule/opensuse/Dockerfile.j2 index 9f689d9..e6aa95d 100644 --- a/molecule/opensuse/Dockerfile.j2 +++ b/molecule/opensuse/Dockerfile.j2 @@ -6,8 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ + elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ + elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ + elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/opensuse/INSTALL.rst b/molecule/opensuse/INSTALL.rst index e26493b..6a44bde 100644 --- a/molecule/opensuse/INSTALL.rst +++ b/molecule/opensuse/INSTALL.rst @@ -1,16 +1,22 @@ ******* -Install +Docker driver installation guide ******* Requirements ============ * Docker Engine -* docker-py Install ======= +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. + +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site + .. code-block:: bash - $ sudo pip install docker-py + $ pip install 'molecule[docker]' diff --git a/molecule/python3/Dockerfile.j2 b/molecule/python3/Dockerfile.j2 index 72db3ec..2add8b0 100644 --- a/molecule/python3/Dockerfile.j2 +++ b/molecule/python3/Dockerfile.j2 @@ -7,7 +7,7 @@ FROM {{ item.image }} {% endif %} RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates && apt-get clean && ln -s /usr/bin/python3 /usr/bin/python; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ diff --git a/molecule/python3/INSTALL.rst b/molecule/python3/INSTALL.rst index 3904805..6a44bde 100644 --- a/molecule/python3/INSTALL.rst +++ b/molecule/python3/INSTALL.rst @@ -5,22 +5,18 @@ Docker driver installation guide Requirements ============ -* General molecule dependencies (see https://molecule.readthedocs.io/en/latest/installation.html) * Docker Engine -* docker-py -* docker Install ======= -Ansible < 2.6 +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. -.. code-block:: bash - - $ sudo pip install docker-py - -Ansible >= 2.6 +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site .. code-block:: bash - $ sudo pip install docker + $ pip install 'molecule[docker]' diff --git a/molecule/ubuntu-min/Dockerfile.j2 b/molecule/ubuntu-min/Dockerfile.j2 index 19692c2..e6aa95d 100644 --- a/molecule/ubuntu-min/Dockerfile.j2 +++ b/molecule/ubuntu-min/Dockerfile.j2 @@ -6,9 +6,9 @@ FROM {{ item.registry.url }}/{{ item.image }} FROM {{ item.image }} {% endif %} -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \ +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ + elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/molecule/ubuntu-min/INSTALL.rst b/molecule/ubuntu-min/INSTALL.rst index 3904805..6a44bde 100644 --- a/molecule/ubuntu-min/INSTALL.rst +++ b/molecule/ubuntu-min/INSTALL.rst @@ -5,22 +5,18 @@ Docker driver installation guide Requirements ============ -* General molecule dependencies (see https://molecule.readthedocs.io/en/latest/installation.html) * Docker Engine -* docker-py -* docker Install ======= -Ansible < 2.6 +Please refer to the `Virtual environment`_ documentation for installation best +practices. If not using a virtual environment, please consider passing the +widely recommended `'--user' flag`_ when invoking ``pip``. -.. code-block:: bash - - $ sudo pip install docker-py - -Ansible >= 2.6 +.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ +.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site .. code-block:: bash - $ sudo pip install docker + $ pip install 'molecule[docker]'