Skip to content

Commit a6b1fa8

Browse files
committed
Fix PHP 7.2 install
1 parent 070e7ad commit a6b1fa8

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

Dockerfiles/work/Dockerfile-5.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ RUN set -x \
207207
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
208208
&& chmod +x /usr/local/bin/wp \
209209
# yamllint
210-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
210+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
211211
&& pip install yamllint \
212-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
212+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
213213
# cleanup
214214
&& rm -rf /home/${MY_USER}/.*json \
215215
&& rm -rf /home/${MY_USER}/.cache \

Dockerfiles/work/Dockerfile-5.5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ RUN set -x \
210210
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
211211
&& chmod +x /usr/local/bin/wp \
212212
# yamllint
213-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
213+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
214214
&& pip install yamllint \
215-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
215+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
216216
# cleanup
217217
&& rm -rf /home/${MY_USER}/.*json \
218218
&& rm -rf /home/${MY_USER}/.cache \

Dockerfiles/work/Dockerfile-5.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ RUN set -x \
210210
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
211211
&& chmod +x /usr/local/bin/wp \
212212
# yamllint
213-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
213+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
214214
&& pip install yamllint \
215-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
215+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
216216
# cleanup
217217
&& rm -rf /home/${MY_USER}/.*json \
218218
&& rm -rf /home/${MY_USER}/.cache \

Dockerfiles/work/Dockerfile-7.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ RUN set -x \
210210
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
211211
&& chmod +x /usr/local/bin/wp \
212212
# yamllint
213-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
213+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
214214
&& pip install yamllint \
215-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
215+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
216216
# cleanup
217217
&& rm -rf /home/${MY_USER}/.*json \
218218
&& rm -rf /home/${MY_USER}/.cache \

Dockerfiles/work/Dockerfile-7.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ RUN set -x \
210210
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
211211
&& chmod +x /usr/local/bin/wp \
212212
# yamllint
213-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
213+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
214214
&& pip install yamllint \
215-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
215+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
216216
# cleanup
217217
&& rm -rf /home/${MY_USER}/.*json \
218218
&& rm -rf /home/${MY_USER}/.cache \

Dockerfiles/work/Dockerfile-7.2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ RUN set -x \
210210
&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
211211
&& chmod +x /usr/local/bin/wp \
212212
# yamllint
213-
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev \
213+
&& apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \
214214
&& pip install yamllint \
215-
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/* \
215+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \
216216
# cleanup
217217
&& rm -rf /home/${MY_USER}/.*json \
218218
&& rm -rf /home/${MY_USER}/.cache \

build/ansible/group_vars/all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@ software_available:
326326
yamllint:
327327
check: yamllint --version 2>&1 | grep -E '[.0-9]+'
328328
all:
329-
pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev libyaml-dev
329+
pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev
330330
command: pip install yamllint
331-
post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev libyaml-dev && rm -rf /var/lib/apt/lists/*
331+
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/*
332332
cleanup:
333333
all:
334334
command: |

0 commit comments

Comments
 (0)