From a6b1fa82a9c8647e82296755bf0b3a171f6c394b Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 19 Mar 2018 07:50:43 +0100 Subject: [PATCH] Fix PHP 7.2 install --- Dockerfiles/work/Dockerfile-5.4 | 4 ++-- Dockerfiles/work/Dockerfile-5.5 | 4 ++-- Dockerfiles/work/Dockerfile-5.6 | 4 ++-- Dockerfiles/work/Dockerfile-7.0 | 4 ++-- Dockerfiles/work/Dockerfile-7.1 | 4 ++-- Dockerfiles/work/Dockerfile-7.2 | 4 ++-- build/ansible/group_vars/all.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 9988102..c5706fc 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -207,9 +207,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 4c7079c..c64d3ed 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -210,9 +210,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 826e385..c23ecce 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -210,9 +210,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a41aeb2..2ff108e 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -210,9 +210,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 06e1aaf..1853520 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -210,9 +210,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 565c2b2..e67d69c 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -210,9 +210,9 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \ + && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index fc7fad4..253eca1 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -326,9 +326,9 @@ software_available: yamllint: check: yamllint --version 2>&1 | grep -E '[.0-9]+' all: - pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev + pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev command: pip install yamllint - post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* + post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* cleanup: all: command: |