diff --git a/CHANGELOG.md b/CHANGELOG.md index c2b7808..4d80342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,14 +10,13 @@ - Fixed `pdo_sqlsrv` version for PHP 7.2 - Fixed `sqlsrv` version for PHP 7.2 - Fixed `swoole` version for PHP 7.1 +- Fixed pip installation #### Changed - Removed `opcache` for PHP 8.1 - Removed `xlswriter` for PHP 8.1 - Removed `linuxbrew` for all versions -- Removed `ansible` for all versions -- Removed `yamllint` for all versions -- Updated Python2 to Python3 +- [#201](https://github.com/devilbox/docker-php-fpm/issues/201) Deactivated `psr` and `phalcon` by default ## Release 0.123 diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 0f20931..12f1569 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -767,6 +767,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index dc67ef0..178984d 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -441,8 +441,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -726,8 +724,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -914,6 +910,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 94ffc64..877ef97 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -445,8 +445,6 @@ RUN set -eux \ && pecl install psr-0.5.1 \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -462,8 +460,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -747,10 +743,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -939,6 +931,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 508fee1..a8aa5e5 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -450,8 +450,6 @@ RUN set -eux \ && pecl install psr-0.5.1 \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -467,8 +465,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -774,10 +770,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -968,6 +960,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index fe6fe3b..b016b48 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -467,8 +467,6 @@ RUN set -eux \ && pecl install psr-0.6.0 \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -484,8 +482,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -791,10 +787,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -985,6 +977,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 6c8ec11..3fe98cf 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -501,8 +501,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -518,8 +516,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -916,10 +912,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -1118,6 +1110,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 9dc967d..4fda3fc 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -501,8 +501,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -518,8 +516,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -928,10 +924,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -1132,6 +1124,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 11e7548..150e069 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -504,8 +504,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -521,8 +519,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -931,10 +927,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -1137,6 +1129,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 16daa05..dadfaa4 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -504,8 +504,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -521,8 +519,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -931,10 +927,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -1137,6 +1129,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index a1e4460..0f9730d 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -506,8 +506,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -523,8 +521,6 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ - # Generic post-command - && echo 'true' \ && true @@ -915,10 +911,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ - # ---------- phalcon ---------- - && echo 'true' \ && true @@ -1115,6 +1107,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 34f9461..722bca6 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -422,8 +422,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -695,8 +693,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ && true @@ -873,6 +869,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index b08a7d5..12ec5c3 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -389,8 +389,6 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ - # Generic post-command - && echo 'true' \ && true @@ -659,8 +657,6 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ - # ---------- psr ---------- - && echo 'true' \ && true @@ -831,6 +827,15 @@ RUN set -eux \ && true + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 1e39e2c..07e8ce6 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -48,7 +50,7 @@ RUN set -eux \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -135,11 +137,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -375,8 +377,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -444,6 +452,8 @@ RUN set -eux \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 3821592..ae08147 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -48,7 +50,7 @@ RUN set -eux \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -436,8 +438,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -513,6 +521,8 @@ RUN set -eux \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 3fcbf65..b58684c 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -48,7 +50,7 @@ RUN set -eux \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -470,8 +472,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -551,6 +559,8 @@ RUN set -eux \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 5590f7f..b04e7db 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -48,7 +50,7 @@ RUN set -eux \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -488,8 +490,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -573,6 +581,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 22c7ba1..9007948 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -144,11 +146,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -500,8 +502,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -586,6 +594,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index f5f1262..7186dd9 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -144,11 +146,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -211,20 +213,6 @@ RUN set -eux \ && rm -rf /usr/local/src/drush8/misc \ \ \ -# -------------------- drush9 -------------------- - && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ -&& cd /usr/local/src/drush9 \ -&& git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ - \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \ -&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ -&& rm -rf /usr/local/src/drush9/.git \ -&& rm -rf /usr/local/src/drush9/docs \ -&& rm -rf /usr/local/src/drush9/examples \ -&& rm -rf /usr/local/src/drush9/misc \ - \ - \ # -------------------- drupalconsole -------------------- && DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \ && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ @@ -500,8 +488,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -563,7 +557,6 @@ RUN set -eux \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && drush9 --version | grep -E '9[.0-9]+\s*$' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ && git-flow version | grep -E '[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ @@ -586,6 +579,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 680a09c..daa7360 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -210,20 +212,6 @@ RUN set -eux \ && rm -rf /usr/local/src/drush8/misc \ \ \ -# -------------------- drush9 -------------------- - && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ -&& cd /usr/local/src/drush9 \ -&& git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ - \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 install --no-interaction --no-progress' \ -&& ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ -&& rm -rf /usr/local/src/drush9/.git \ -&& rm -rf /usr/local/src/drush9/docs \ -&& rm -rf /usr/local/src/drush9/examples \ -&& rm -rf /usr/local/src/drush9/misc \ - \ - \ # -------------------- drupalconsole -------------------- && DURL="https://github.com/hechoendrupal/drupal-console-launcher/releases/download/1.9.4/drupal.phar" \ && curl -sS -L --fail "${DURL}" -L -o /usr/local/bin/drupal \ @@ -499,8 +487,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -562,7 +556,6 @@ RUN set -eux \ && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && drush9 --version | grep -E '9[.0-9]+\s*$' \ && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ && git-flow version | grep -E '[0-9][.0-9]+' \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ @@ -585,6 +578,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index a25be33..05d89ea 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -500,8 +502,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -586,6 +594,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 3955c91..aacecb9 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -500,8 +502,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -586,6 +594,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 905e2f7..26574cd 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -495,8 +497,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -580,6 +588,8 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index eac4884..0b0449a 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -399,8 +401,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -473,6 +481,8 @@ RUN set -eux \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 558d2a1..5fc3831 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -143,11 +145,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ +\ +&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ \ \ # -------------------- nvm -------------------- @@ -399,8 +401,14 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- ansible -------------------- + && pip install --no-cache-dir --force-reinstall ansible || true \ + \ +# -------------------- yamllint -------------------- + && pip install --no-cache-dir --force-reinstall yamllint || true \ + \ # -------------------- yq -------------------- - && pip3 install --no-cache-dir --force-reinstall yq || true \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -473,6 +481,8 @@ RUN set -eux \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- + && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ + && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- diff --git a/README.md b/README.md index f7a549a..2813147 100644 --- a/README.md +++ b/README.md @@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.1 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, zip, zlib + apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, yaml, zip, zlib @@ -989,6 +989,10 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc Description + + Ansible + Automation tool. + asgardcms AsgardCMS cli installer. @@ -1125,6 +1129,10 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc wp-cli WP-CLI is the command-line interface for WordPress. + + yamllint + Yaml command line linter. + yarn Fast, reliable and secure dependency management. diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index c6fc6e4..668c259 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -432,6 +432,15 @@ RUN set -eux \ {% endif %} + + +# Deactive PSR and Phalcon: +# https://github.com/devilbox/docker-php-fpm/issues/201 +RUN set -eux \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \ + && rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \ + + ### ### Ports ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 7926bcc..b2a09f4 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -35,6 +35,8 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + apt-transport-https \ + ca-certificates \ curl \ dirmngr \ gnupg \ @@ -391,13 +393,13 @@ RUN set -eux \ {%- endif -%} {#- Version specific gem version available? -#} {%- if php_version in pip_available[tool] and 'version' in pip_available[tool][php_version] -%} - {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} || true \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} || true \ {#- Generic gem version available? -#} {%- elif 'all' in pip_available[tool] and 'version' in pip_available[tool]['all'] -%} - {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} || true \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} || true \ {#- No version info available -#} {%- else -%} - {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} || true \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} || true \ {%- endif -%} {#- Fail fast version -#} {%- if build_fail_fast -%} diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index e7814ae..19de87f 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -783,7 +783,6 @@ extensions_available: version: 0.6.0 # NOTE: 0.6.1 fails with: Package "psr" Version "0.6.1" does not have REST xml available all: type: pecl - post: echo 'true' # FIXME: disable module phalcon: disabled: [5.2, 8.0, 8.1] # TODO: currently disabled for 7.4 as it breaks 5.3: @@ -821,7 +820,6 @@ extensions_available: git_url: https://github.com/phalcon/cphalcon git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) command: cd build && ./install - post: echo 'true' # FIXME: disable module phar: already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1] 5.2: diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 94d29ca..bd55f9e 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -73,8 +73,8 @@ npm_enabled: # Python pip packages to install # ------------------------------------------------------------------------------------------------- pip_enabled: - #- ansible - #- yamllint + - ansible + - yamllint - yq @@ -177,13 +177,13 @@ apt_repositories_available: key: 9DA31620334BD75D9DCB49F368818C72E52529D4 pgsql: 5.2: - deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.3: - deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.4: - deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: - deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main all: deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main pre: curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - @@ -409,11 +409,11 @@ software_available: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython3-dev \ - python3 \ - python3-pip \ + libpython-dev \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ + \ + && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \ # nvm is a dependency for others nvm: check: su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' @@ -500,7 +500,7 @@ software_available: && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ drush9: - disabled: [5.2, 5.3, 5.4, 5.5, 8.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 7.0, 7.1, 8.0, 8.1] check: drush9 --version | grep -E '9[.0-9]+\s*$' all: pre: | diff --git a/build/gen-readme.sh b/build/gen-readme.sh index 885dca9..7ee75cb 100755 --- a/build/gen-readme.sh +++ b/build/gen-readme.sh @@ -47,6 +47,14 @@ get_modules() { ALL_MODULES="${ALL_MODULES},blackfire"; fi + if docker run --rm $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'psr.so' | grep -q psr.so; then + ALL_MODULES="${ALL_MODULES},psr"; + fi + + if docker run --rm $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'phalcon.so' | grep -q phalcon.so; then + ALL_MODULES="${ALL_MODULES},phalcon"; + fi + # Process module string into correct format for README.md PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/^\[.*//g' )" # Remove PHP Modules headlines PHP_MODULES="${ALL_MODULES}${PHP_MODULES}" # Append all available modules