From 116aa387fbcd4e361b4595cd3aaa69194c5d7e0f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 13:35:03 +0100 Subject: [PATCH] Changed PHP 5.5 to Debian stretch --- Dockerfiles/base/Dockerfile-5.5 | 7 ------- Dockerfiles/mods/Dockerfile-5.5 | 22 +++++++++++--------- Dockerfiles/work/Dockerfile-5.5 | 15 ++++++------- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- build/ansible/group_vars/all/mods.yml | 12 +++-------- build/ansible/group_vars/all/work.yml | 18 ++-------------- 7 files changed, 27 insertions(+), 51 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 1e06281..bd8d591 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -43,13 +43,6 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -RUN set -eux \ - && rm -f /etc/apt/sources.list \ - && { \ - echo "deb http://ftp.debian.org/debian jessie main"; \ - echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ - echo "deb http://security.debian.org/debian-security jessie/updates main"; \ - } | tee /etc/apt/sources.list RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f6c083c..9224171 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -43,7 +43,8 @@ RUN set -eux \ libssl-dev \ libtidy-dev \ libvpx-dev \ - libwebp5 \ + libwebp-dev \ + libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -744,22 +745,23 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu52 \ + libicu57 \ libjpeg62-turbo \ - libmagickwand-6.q16-2 \ + libmagickwand-6.q16-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ - libnghttp2-5 \ - libpng12-0 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - librabbitmq1 \ + librabbitmq4 \ librdkafka1 \ librecode0 \ libsybdb5 \ - libtidy-0.99-0 \ - libvpx1 \ - libwebp5 \ + libtidy5 \ + libvpx4 \ + libwebp-dev \ + libwebp6 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 6bee280..b7da7ff 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -55,16 +55,16 @@ RUN set -eux \ dirmngr \ gnupg \ \ - && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \ - && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \ + && echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \ && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \ - && 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 \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ + && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | 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 \ \ @@ -79,6 +79,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ + certbot \ coreutils \ dnsutils \ dos2unix \ @@ -353,10 +354,10 @@ RUN set -eux \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- - && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \ + && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 5f60cf8..0b16185 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -57,7 +57,7 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -{% if php_version in [5.4, 5.5] %} +{% if php_version in [5.4] %} RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 375e6b8..77a485c 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -92,7 +92,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ -{% if php_version != 5.4 and php_version != 5.5 %} +{% if php_version != 5.4 %} certbot \ {% endif %} coreutils \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 85c0038..577e9f6 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -161,7 +161,6 @@ extensions_available: 5.5: type: pecl version: 1.9.3 - run_dep: [librabbitmq1] all: type: pecl command: echo "/usr" | pecl install amqp @@ -297,8 +296,7 @@ extensions_available: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ configure: --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf - build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev] - run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] 5.6: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ @@ -377,8 +375,6 @@ extensions_available: disabled: [5.2, 5.3, 5.4] # Only available since 5.3. 5.3 and 5.4 segfaults 5.5: type: pecl - build_dep: [libmagickwand-dev, libwebp5, ghostscript] - run_dep: [libmagickwand-6.q16-2, libwebp5, ghostscript] 5.6: type: pecl run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] @@ -427,7 +423,7 @@ extensions_available: run_dep: [libicu52] 5.5: type: builtin - run_dep: [libicu52] + run_dep: [libicu57] 5.6: type: builtin run_dep: [libicu57] @@ -654,7 +650,6 @@ extensions_available: run_dep: [libmysqlclient18] 5.5: type: builtin - run_dep: [libmysqlclient18] all: type: builtin run_dep: [libmariadbclient18] @@ -1111,7 +1106,6 @@ extensions_available: 5.5: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] 5.6: type: pecl version: 1.9.23 @@ -1147,7 +1141,7 @@ extensions_available: run_dep: [libtidy-0.99-0] 5.5: type: builtin - run_dep: [libtidy-0.99-0] + run_dep: [libtidy5] 5.6: type: builtin run_dep: [libtidy5] diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 743a8ee..7f67662 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -131,9 +131,6 @@ apt_repositories_available: 5.4: pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until deb: deb http://archive.debian.org/debian jessie-backports main - 5.5: - pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until - deb: deb http://archive.debian.org/debian jessie-backports main all: pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 deb: deb http://ftp.debian.org/debian stretch-backports main @@ -163,9 +160,6 @@ apt_repositories_available: 5.4: deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.5: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 all: deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 @@ -179,7 +173,8 @@ apt_repositories_available: 5.4: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: - deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main + pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - 5.6: deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - @@ -946,15 +941,6 @@ software_available: && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ - 5.5: - pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" - command: | - DEBIAN_FRONTEND=noninteractive apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ - && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ - && dpkg -i /tmp/wkhtmltopdf.deb \ - && rm -f /tmp/wkhtmltopdf.deb \ 5.6: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \