From 1640850b75e12f74b17f4ac1ee3c46f781516785 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 14:55:22 +0100 Subject: [PATCH 01/25] Changed PHP 5.2 and PHP 5.3 base images to Debian stretch --- CHANGELOG.md | 6 ++++++ Dockerfiles/base/Dockerfile-5.2 | 7 ------- Dockerfiles/base/Dockerfile-5.3 | 7 ------- Dockerfiles/work/Dockerfile-5.2 | 11 ++++++----- Dockerfiles/work/Dockerfile-5.3 | 11 ++++++----- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- build/ansible/group_vars/all/work.yml | 16 ---------------- 8 files changed, 20 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd7cf66..66cf7a1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.135 + +#### CHANGED +- Changed PHP 5.2 and PHP 5.3 base images to Debian stretch + + ## Release 0.134 #### Changed diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 6ee44f8d..944b505b 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -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 procps \ diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index 5f804560..77d24030 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -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 procps \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 29c9f411..14f9a979 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -54,16 +54,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/ bullseye-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 \ \ @@ -78,6 +78,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ + certbot \ coreutils \ dnsutils \ dos2unix \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 6ec6df3d..6acc091d 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -54,16 +54,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/ bullseye-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 \ \ @@ -78,6 +78,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ + certbot \ coreutils \ dnsutils \ dos2unix \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index cac36102..fa15ece2 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -55,7 +55,7 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -{% if php_version in [5.2, 5.3, 5.4, 5.5] %} +{% if php_version in [5.4, 5.5] %} 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 4f165738..2700a80a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -91,7 +91,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ -{% if php_version != 5.2 and php_version != 5.3 and php_version != 5.4 and php_version != 5.5 %} +{% if php_version != 5.4 and php_version != 5.5 %} certbot \ {% endif %} coreutils \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 4d51742c..bc7b10c9 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -128,12 +128,6 @@ software_enabled: # apt_repositories_available: backports: - 5.2: - 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.3: - 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.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 @@ -166,12 +160,6 @@ apt_repositories_available: # Get keys # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' mongo: - 5.2: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.3: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 5.4: deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 @@ -182,10 +170,6 @@ apt_repositories_available: deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 pgsql: - 5.2: - deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main - 5.3: - deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.4: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: From 40ac8e4ef0adc0cf54786fc54f54bdb9d5ccc531 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 14:59:54 +0100 Subject: [PATCH 02/25] Fixed cloning of gitflow --- CHANGELOG.md | 5 ++++- Dockerfiles/work/Dockerfile-5.2 | 2 +- Dockerfiles/work/Dockerfile-5.3 | 2 +- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- Dockerfiles/work/Dockerfile-8.0 | 2 +- Dockerfiles/work/Dockerfile-8.1 | 2 +- Dockerfiles/work/Dockerfile-8.2 | 2 +- build/ansible/group_vars/all/work.yml | 2 +- 15 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66cf7a1c..2106256b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ ## Release 0.135 -#### CHANGED +#### Fixed +- Fixed cloning of gitflow + +#### Changed - Changed PHP 5.2 and PHP 5.3 base images to Debian stretch diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 14f9a979..055ec918 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -188,7 +188,7 @@ RUN set -eux \ \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 6acc091d..aea8394a 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -210,7 +210,7 @@ RUN set -eux \ \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index a13a0f8e..085cdf9a 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -227,7 +227,7 @@ RUN set -eux \ \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 021b2bcc..ec37acca 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -232,7 +232,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index db505555..e9d383dd 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -248,7 +248,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index af23551c..eee534b5 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -229,7 +229,7 @@ RUN set -eux \ \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 303d1c25..e8d4fc60 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -228,7 +228,7 @@ RUN set -eux \ \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 6fbab8cc..20d206af 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -247,7 +247,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 7735063d..d4d1f46b 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -248,7 +248,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 00ec5871..3aa1beae 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -248,7 +248,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/drupal \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 0e46201f..6ffdc826 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -201,7 +201,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/dep \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index e2c37702..676a4fc7 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -201,7 +201,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/dep \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 92af7b8a..650663ee 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -201,7 +201,7 @@ RUN set -eux \ && chmod +x /usr/local/bin/dep \ \ # -------------------- gitflow -------------------- - && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + && git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index bc7b10c9..22057699 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -613,7 +613,7 @@ software_available: check: git-flow version | grep -E '[0-9][.0-9]+' all: command: | - git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ + git clone https://github.com/petervanderdoes/gitflow-avh /tmp/gitflow \ && cd /tmp/gitflow \ && make install \ && cd / && rm -rf /tmp/gitflow \ From e145f9cec87ab0d729db4fcc23760ddf769f2f00 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 15:12:39 +0100 Subject: [PATCH 03/25] Fixed pidof issue on QUEMU by replacing it with pgrep --- CHANGELOG.md | 1 + Dockerfiles/prod/data/postfix.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2106256b..a15de23e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ #### Fixed - Fixed cloning of gitflow +- Fixed pidof issue on QUEMU by replacing it with pgrep [#854](https://github.com/cytopia/devilbox/issues/854) #### Changed - Changed PHP 5.2 and PHP 5.3 base images to Debian stretch diff --git a/Dockerfiles/prod/data/postfix.sh b/Dockerfiles/prod/data/postfix.sh index 694db2af..03f8d04f 100755 --- a/Dockerfiles/prod/data/postfix.sh +++ b/Dockerfiles/prod/data/postfix.sh @@ -29,15 +29,15 @@ MAILPID="/var/spool/postfix/pid/master.pid" ### ### Sanity checks ### -if ! command -v pidof >/dev/null 2>&1; then - echo "pidof is required for cleaning up tail command." +if ! command -v pgrep >/dev/null 2>&1; then + echo "pgrep is required for cleaning up tail command." exit 1 fi # Give rsyslogd some time to start up sleep 2 -if ! pidof rsyslogd >/dev/null 2>&1; then +if ! pgrep rsyslogd >/dev/null 2>&1; then echo "rsyslogd is not running, but required for mail logging." exit 1 fi From 64e290a35952aa50e9f1b544525cdda990cb541e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 15:22:25 +0100 Subject: [PATCH 04/25] Update nightly workflow --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d2b3d529..3830dfbe 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - '8.2' refs: - 'master' - - '0.134' + - '0.135' steps: # ------------------------------------------------------------ From 31489459adae119e6d3e4a339b9023a2d8e0d63e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 15:39:31 +0100 Subject: [PATCH 05/25] Ensure mkdir does not fail if directory already exists --- Dockerfiles/mods/Dockerfile-5.2 | 2 +- Dockerfiles/mods/Dockerfile-5.3 | 2 +- build/ansible/group_vars/all/mods.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 53ae751b..a68781b9 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -166,7 +166,7 @@ RUN set -eux \ && ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ -mkdir /usr/include/freetype2/freetype && \ +mkdir -p /usr/include/freetype2/freetype && \ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ \ # Installation: Version specific diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 8800348d..4ea2b19f 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -165,7 +165,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ + && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ # Installation: Version specific # Type: Built-in extension # Custom: configure command diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 0d2cd198..ad858598 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -281,14 +281,14 @@ extensions_available: ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ - mkdir /usr/include/freetype2/freetype && \ + mkdir -p /usr/include/freetype2/freetype && \ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ configure: --with-gd --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] 5.3: type: builtin - pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h + pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h configure: --with-gd --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] From e16fdce86071ac22d2ae768bc5b5a8d842540c82 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 15:44:26 +0100 Subject: [PATCH 06/25] Use correct run_deps for Debian version --- Dockerfiles/mods/Dockerfile-5.2 | 2 +- Dockerfiles/mods/Dockerfile-5.3 | 2 +- build/ansible/group_vars/all/mods.yml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index a68781b9..056ef906 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -585,7 +585,7 @@ RUN set -eux \ libmysqlclient18 \ libpng12-0 \ libpq5 \ - librabbitmq1 \ + librabbitmq4 \ librecode0 \ libsybdb5 \ libtidy-0.99-0 \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 4ea2b19f..e0f9e0f4 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -710,7 +710,7 @@ RUN set -eux \ libnghttp2-5 \ libpng12-0 \ libpq5 \ - librabbitmq1 \ + librabbitmq4 \ librdkafka1 \ librecode0 \ libsybdb5 \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index ad858598..da18ed0f 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -148,13 +148,11 @@ extensions_available: amqp: disabled: [] 5.2: - run_dep: [librabbitmq1] type: pecl version: 1.4.0 5.3: type: pecl version: 1.9.3 - run_dep: [librabbitmq1] 5.4: type: pecl version: 1.9.3 From b0c487ff28c04bc4ad104d791ec155f1b72e34b0 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 15:54:19 +0100 Subject: [PATCH 07/25] Test ARM64 builds --- .github/workflows/arm64.yml | 352 ++++++++++++++++++++++++++++++++++++ Makefile | 13 +- 2 files changed, 363 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/arm64.yml diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml new file mode 100644 index 00000000..7fd57eda --- /dev/null +++ b/.github/workflows/arm64.yml @@ -0,0 +1,352 @@ +--- + +# ------------------------------------------------------------------------------------------------- +# Job Name +# ------------------------------------------------------------------------------------------------- +name: build-arm64 + + +# ------------------------------------------------------------------------------------------------- +# When to run +# ------------------------------------------------------------------------------------------------- +on: + # Runs on Push + push: + + +# ------------------------------------------------------------------------------------------------- +# What to run +# ------------------------------------------------------------------------------------------------- +jobs: + build: + name: "[ PHP-${{ matrix.version }} (arm64) ]" + runs-on: ubuntu-latest + strategy: + fail-fast: False + matrix: + version: + - '5.2' + - '5.3' + - '5.4' + - '5.5' + - '5.6' + - '7.0' + - '7.1' + - '7.2' + - '7.3' + - '7.4' + - '8.0' + - '8.1' + - '8.2' + steps: + + # ------------------------------------------------------------ + # Setup repository + # ------------------------------------------------------------ + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set variables + id: vars + run: | + + # Retrieve git info (tags, etc) + git fetch --all + + # Branch, Tag or Commit + GIT_TYPE="$( \ + curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ + | sh \ + | grep '^GIT_TYPE' \ + | sed 's|.*=||g' \ + )" + # Branch name, Tag name or Commit Hash + GIT_SLUG="$( \ + curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ + | sh \ + | grep '^GIT_NAME' \ + | sed 's|.*=||g' \ + )" + # Docker Tag + if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then + DOCKER_TAG_BASE="${VERSION}-base" + DOCKER_TAG_MODS="${VERSION}-mods" + DOCKER_TAG_PROD="${VERSION}-prod" + DOCKER_TAG_WORK="${VERSION}-work" + else + DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}" + DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}" + DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}" + DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}" + fi + + # Output + echo "GIT_TYPE=${GIT_TYPE}" + echo "GIT_SLUG=${GIT_SLUG}" + echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" + echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" + echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" + echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" + + # Export variable + # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files + echo "GIT_TYPE=${GIT_TYPE}" >> ${GITHUB_ENV} + echo "GIT_SLUG=${GIT_SLUG}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV} + env: + VERSION: ${{ matrix.version }} + + - name: "[SETUP] Setup QEMU environment" + uses: docker/setup-qemu-action@v1 + with: + image: tonistiigi/binfmt:latest + platforms: all + + + # ------------------------------------------------------------ + # Base + # ------------------------------------------------------------ + - name: Build Base + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make _pull-base-image VERSION=${VERSION} ARCH=linux/arm64 + retry make build-base VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Base + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-base VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Mods + # ------------------------------------------------------------ + - name: Build Mods + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-mods VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Mods + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-mods VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Prod + # ------------------------------------------------------------ + - name: Build Prod + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-prod VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Prod + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-prod VERSION=${VERSION} + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Work + # ------------------------------------------------------------ + - name: Build Work + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-work VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Work + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-work VERSION=${VERSION} + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Diff README.md + # ------------------------------------------------------------ + - name: Diff README.md + run: | + make gen-readme VERSION=${VERSION} + git diff --quiet || { echo "Build Changes"; git diff; git status; false; } + env: + VERSION: ${{ matrix.version }} + + + # ------------------------------------------------------------ + # Deploy + # ------------------------------------------------------------ + #- name: Publish images (only repo owner) + # run: | + # retry() { + # for n in $(seq ${RETRIES}); do + # echo "[${n}/${RETRIES}] ${*}"; + # if eval "${*}"; then + # echo "[SUCC] ${n}/${RETRIES}"; + # return 0; + # fi; + # sleep ${PAUSE}; + # echo "[FAIL] ${n}/${RETRIES}"; + # done; + # return 1; + # } + + # # Output + # echo "GIT_TYPE=${GIT_TYPE}" + # echo "GIT_SLUG=${GIT_SLUG}" + # echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" + # echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" + # echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" + # echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" + + # # Tag image + # retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}" + # retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}" + # retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}" + # retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}" + # docker images + + # # Login + # retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }} + + # # Push + # retry make push TAG=${DOCKER_TAG_BASE} + # retry make push TAG=${DOCKER_TAG_MODS} + # retry make push TAG=${DOCKER_TAG_PROD} + # retry make push TAG=${DOCKER_TAG_WORK} + # env: + # VERSION: ${{ matrix.version }} + # RETRIES: 20 + # PAUSE: 10 + # # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions + # if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id + # && ( + # (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) + # || + # (github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) + # || + # (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-')) + # ) diff --git a/Makefile b/Makefile index 1e463c3d..34c89f82 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ CURRENT_DIR = $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) DIR = Dockerfiles IMAGE = devilbox/php-fpm +ARCH = linux/amd64 + NO_CACHE = PHP_EXT_DIR = @@ -158,6 +160,7 @@ endif gen-dockerfiles: docker run --rm \ + --platform $(ARCH) \ $$(tty -s && echo "-it" || echo) \ -e USER=ansible \ -e MY_UID=$$(id -u) \ @@ -179,6 +182,7 @@ gen-dockerfiles: build-base: _check-version build-base: docker build $(NO_CACHE) \ + --platform $(ARCH) \ --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ --label "org.opencontainers.image.revision"="$$(git rev-parse HEAD))" \ @@ -193,16 +197,18 @@ build-mods: _check-image-exists build-mods: ifeq ($(strip $(TARGET)),) docker build $(NO_CACHE) \ + --platform $(ARCH) \ --target builder \ -t $(IMAGE):$(VERSION)-mods \ -f $(DIR)/mods/Dockerfile-$(VERSION) $(DIR)/mods; @# $(NO_CACHE) is removed, as it would otherwise rebuild the 'builder' image again. docker build \ + --platform $(ARCH) \ --target final \ --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ --label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \ - --build-arg EXT_DIR="$$( docker run --rm --entrypoint=php $(IMAGE):$(VERSION)-mods -i \ + --build-arg EXT_DIR="$$( docker run --rm --platform $(ARCH) --entrypoint=php $(IMAGE):$(VERSION)-mods -i \ | grep ^extension_dir \ | awk -F '=>' '{print $$2}' \ | xargs \ @@ -212,6 +218,7 @@ ifeq ($(strip $(TARGET)),) -f $(DIR)/mods/Dockerfile-$(VERSION) $(DIR)/mods; else docker build $(NO_CACHE) \ + --platform $(ARCH) \ --target $(TARGET) \ --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ @@ -227,6 +234,7 @@ build-prod: _EXIST_IMAGE=mods build-prod: _check-image-exists build-prod: docker build $(NO_CACHE) \ + --platform $(ARCH) \ --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ --label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \ @@ -240,6 +248,7 @@ build-work: _EXIST_IMAGE=prod build-work: _check-image-exists build-work: docker build $(NO_CACHE) \ + --platform $(ARCH) \ --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ --label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \ @@ -415,4 +424,4 @@ _check-image-exists: _pull-base-image: @echo "Pulling root image for PHP ${VERSION}" - @docker pull $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';) + @docker pull --platform $(ARCH) $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';) From 2517c33baefb182f77fe3a98edf54783cd760eb6 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 16:09:07 +0100 Subject: [PATCH 08/25] Removed photoncms binaries (their GitHub organization went private) --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.5 | 5 ----- Dockerfiles/work/Dockerfile-5.6 | 5 ----- Dockerfiles/work/Dockerfile-7.0 | 5 ----- Dockerfiles/work/Dockerfile-7.1 | 5 ----- Dockerfiles/work/Dockerfile-7.2 | 5 ----- Dockerfiles/work/Dockerfile-7.3 | 5 ----- Dockerfiles/work/Dockerfile-7.4 | 5 ----- build/ansible/group_vars/all/work.yml | 14 +++++++------- 9 files changed, 8 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a15de23e..9c0f1fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Changed - Changed PHP 5.2 and PHP 5.3 base images to Debian stretch +- Removed photoncms binaries (their GitHub organization went private) ## Release 0.134 diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index ec37acca..32ab4a44 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -410,10 +410,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -604,7 +600,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index e9d383dd..6427ca2f 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -426,10 +426,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -618,7 +614,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index eee534b5..f7251380 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -407,10 +407,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -597,7 +593,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index e8d4fc60..6cacdfef 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -406,10 +406,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -596,7 +592,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 20d206af..c8ba9b8e 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -426,10 +426,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -618,7 +614,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d4d1f46b..d1badf0c 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -427,10 +427,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -619,7 +615,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 3aa1beae..a62d5cc3 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -427,10 +427,6 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require laravel/lumen-installer \ && ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/ \ \ -# -------------------- photon -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require photoncms/installer \ - && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -619,7 +615,6 @@ RUN set -eux \ && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ - && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 22057699..8cd41b05 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -34,7 +34,7 @@ composer_enabled: - asgardcms - codeception - lumen - - photon + #- photon - prestissimo @@ -229,12 +229,12 @@ composer_available: name: laravel/lumen-installer link: lumen version: 2 - photon: - disabled: [5.2, 5.3, 5.4, 8.0, 8.1, 8.2] - check: photon --version | grep -E 'Installer [0-9][.0-9]+' - name: photoncms/installer - link: photon - version: 2 + #photon: + # disabled: [5.2, 5.3, 5.4, 8.0, 8.1, 8.2] + # check: photon --version | grep -E 'Installer [0-9][.0-9]+' + # name: photoncms/installer + # link: photon + # version: 2 prestissimo: disabled: [5.2, 8.0, 8.1, 8.2] name: hirak/prestissimo From 5585109fb8031b833a938a8b702f2f483c85473e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 16:10:03 +0100 Subject: [PATCH 09/25] Variablize Docker platform --- Makefile | 12 ++++---- build/gen-readme.sh | 72 +++++++++++++++++++++++---------------------- tests/test.sh | 34 +++++++++++---------- 3 files changed, 62 insertions(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 34c89f82..f907975f 100644 --- a/Makefile +++ b/Makefile @@ -149,13 +149,13 @@ lint-yaml: gen-readme: ifeq ($(strip $(VERSION)),) @echo "Generate README.md for all PHP versions" - cd build; ./gen-readme.sh + cd build; ./gen-readme.sh $(ARCH) else @echo "Generate README.md for PHP $(VERSION)" @$(MAKE) --no-print-directory _check-version @$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=base @$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=mods - cd build; ./gen-readme.sh $(VERSION) + cd build; ./gen-readme.sh $(ARCH) $(VERSION) endif gen-dockerfiles: @@ -286,28 +286,28 @@ test-base: _check-version test-base: _EXIST_IMAGE=base test-base: _check-image-exists test-base: - ./tests/test.sh ${VERSION} base + ./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) base test-mods: _check-version test-mods: _EXIST_IMAGE=mods test-mods: _check-image-exists test-mods: _check-version - ./tests/test.sh ${VERSION} mods + ./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) mods test-prod: _check-version test-prod: _EXIST_IMAGE=prod test-prod: _check-image-exists test-prod: _check-version - ./tests/test.sh ${VERSION} prod + ./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) prod test-work: _check-version test-work: _EXIST_IMAGE=work test-work: _check-image-exists test-work: _check-version - ./tests/test.sh ${VERSION} work + ./tests/test.sh $(IMAGE) $(ARCH) $(VERSION) work # ------------------------------------------------------------------------------------------------- diff --git a/build/gen-readme.sh b/build/gen-readme.sh index 78bcf385..829db03a 100755 --- a/build/gen-readme.sh +++ b/build/gen-readme.sh @@ -8,25 +8,27 @@ set -o pipefail # Get absolute directory of this script CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" +ARCH="${1:-linux/amd64}" + ### ### Show Usage ### print_usage() { - echo "Usage: gen-readme.sh" - echo " gen-readme.sh 5.2" - echo " gen-readme.sh 5.3" - echo " gen-readme.sh 5.4" - echo " gen-readme.sh 5.5" - echo " gen-readme.sh 5.6" - echo " gen-readme.sh 7.0" - echo " gen-readme.sh 7.1" - echo " gen-readme.sh 7.2" - echo " gen-readme.sh 7.3" - echo " gen-readme.sh 7.4" - echo " gen-readme.sh 8.0" - echo " gen-readme.sh 8.1" - echo " gen-readme.sh 8.2" + echo "Usage: gen-readme.sh []" + echo " gen-readme.sh 5.2" + echo " gen-readme.sh 5.3" + echo " gen-readme.sh 5.4" + echo " gen-readme.sh 5.5" + echo " gen-readme.sh 5.6" + echo " gen-readme.sh 7.0" + echo " gen-readme.sh 7.1" + echo " gen-readme.sh 7.2" + echo " gen-readme.sh 7.3" + echo " gen-readme.sh 7.4" + echo " gen-readme.sh 8.0" + echo " gen-readme.sh 8.1" + echo " gen-readme.sh 8.2" } @@ -37,22 +39,22 @@ get_modules() { tag="${1}" # Retrieve all modules - PHP_MODULES="$( docker run --rm $(tty -s && echo '-it' || echo) --entrypoint=php devilbox/php-fpm:${tag} -m )" + PHP_MODULES="$( docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=php devilbox/php-fpm:${tag} -m )" ALL_MODULES= - if docker run --rm $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'ioncube.so' | grep -q ioncube.so; then + if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'ioncube.so' | grep -q ioncube.so; then ALL_MODULES="${ALL_MODULES},ioncube"; fi - if docker run --rm $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'blackfire.so' | grep -q blackfire.so; then + if docker run --rm --platform "${ARCH}" $(tty -s && echo '-it' || echo) --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'blackfire.so' | grep -q blackfire.so; then 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 + if docker run --rm --platform "${ARCH}" $(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 + if docker run --rm --platform "${ARCH}" $(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 @@ -91,7 +93,7 @@ update_readme() { ### ### Entrypoint ### -if [ "${#}" -eq "0" ]; then +if [ "${#}" -eq "0" ] || [ "${#}" -eq "1" ]; then # Update PHP modules for all versions at once update_readme "5.2" update_readme "5.3" @@ -106,31 +108,31 @@ if [ "${#}" -eq "0" ]; then update_readme "8.0" update_readme "8.1" update_readme "8.2" -elif [ "${#}" -gt "1" ]; then +elif [ "${#}" -gt "2" ]; then # Specifying more than 1 argument is wrong echo "Error, invalid number of arguments." print_usage exit 1 else - if [ "${1}" != "5.2" ] \ - && [ "${1}" != "5.3" ] \ - && [ "${1}" != "5.4" ] \ - && [ "${1}" != "5.5" ] \ - && [ "${1}" != "5.6" ] \ - && [ "${1}" != "7.0" ] \ - && [ "${1}" != "7.1" ] \ - && [ "${1}" != "7.2" ] \ - && [ "${1}" != "7.3" ] \ - && [ "${1}" != "7.4" ] \ - && [ "${1}" != "8.0" ] \ - && [ "${1}" != "8.1" ] \ - && [ "${1}" != "8.2" ]; then + if [ "${2}" != "5.2" ] \ + && [ "${2}" != "5.3" ] \ + && [ "${2}" != "5.4" ] \ + && [ "${2}" != "5.5" ] \ + && [ "${2}" != "5.6" ] \ + && [ "${2}" != "7.0" ] \ + && [ "${2}" != "7.1" ] \ + && [ "${2}" != "7.2" ] \ + && [ "${2}" != "7.3" ] \ + && [ "${2}" != "7.4" ] \ + && [ "${2}" != "8.0" ] \ + && [ "${2}" != "8.1" ] \ + && [ "${2}" != "8.2" ]; then # Argument does not match any of the PHP versions echo "Error, invalid argument." print_usage exit 1 else # Update PHP modules for one specific PHP version - update_readme "${1}" + update_readme "${2}" fi fi diff --git a/tests/test.sh b/tests/test.sh index 53227b17..0a5463a5 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -16,7 +16,6 @@ IFS=$'\n' ### ### Variables ### - # Current directory CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" @@ -31,51 +30,56 @@ CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" ### ### Sanity check ### -if [ "${#}" -ne "2" ]; then - echo "Usage: start.ci " +if [ "${#}" -ne "4" ]; then + echo "Usage: start.ci " exit 1 fi +IMAGE="${1}" +ARCH="${2}" +VERSION="${3}" +FLAVOUR="${4}" + ### ### Run tests ### -if [ "${2}" = "base" ] || [ "${2}" = "mods" ] || [ "${2}" = "prod" ] || [ "${2}" = "work" ]; then +if [ "${FLAVOUR}" = "base" ] || [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then TESTS="$( find ${CWD} -regex "${CWD}/base/[0-9].+.*\.sh" | sort -u )" for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" - printf "\033[0;33m%s %s\033[0m\n" "#" "[${1}-${2}]: ${t}" + printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} devilbox/php-fpm ${1} ${2} + time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}" done fi -if [ "${2}" = "mods" ] || [ "${2}" = "prod" ] || [ "${2}" = "work" ]; then +if [ "${FLAVOUR}" = "mods" ] || [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then TESTS="$( find ${CWD} -regex "${CWD}/mods/[0-9].+.*\.sh" | sort -u )" for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" - printf "\033[0;33m%s %s\033[0m\n" "#" "[${1}-${2}]: ${t}" + printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} devilbox/php-fpm ${1} ${2} + time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}" done fi -if [ "${2}" = "prod" ] || [ "${2}" = "work" ]; then +if [ "${FLAVOUR}" = "prod" ] || [ "${FLAVOUR}" = "work" ]; then TESTS="$( find ${CWD} -regex "${CWD}/prod/[0-9].+.*\.sh" | sort -u )" for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" - printf "\033[0;33m%s %s\033[0m\n" "#" "[${1}-${2}]: ${t}" + printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} devilbox/php-fpm ${1} ${2} + time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}" done fi -if [ "${2}" = "work" ]; then +if [ "${FLAVOUR}" = "work" ]; then TESTS="$( find ${CWD} -regex "${CWD}/work/[0-9].+.*\.sh" | sort -u )" for t in ${TESTS}; do printf "\n\n\033[0;33m%s\033[0m\n" "################################################################################" - printf "\033[0;33m%s %s\033[0m\n" "#" "[${1}-${2}]: ${t}" + printf "\033[0;33m%s %s\033[0m\n" "#" "[${VERSION}-${FLAVOUR}] (${ARCH}): ${t}" printf "\033[0;33m%s\033[0m\n\n" "################################################################################" - time ${t} devilbox/php-fpm ${1} ${2} + time ${t} "${IMAGE}" "${VERSION}" "${FLAVOUR}" done fi From 20c5b88e52917057007cfb59077c8088bbf0b43c Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 16:52:42 +0100 Subject: [PATCH 10/25] Fix amqp extension for PHP 5.2 --- Dockerfiles/mods/Dockerfile-5.2 | 2 +- build/ansible/group_vars/all/mods.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 056ef906..7fea8aa8 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -82,7 +82,7 @@ RUN set -eux \ # Installation: Version specific # Type: PECL extension # Default: Pecl command - && pecl install amqp-1.4.0 \ + && pecl install amqp-1.6.1 \ # Enabling && docker-php-ext-enable amqp \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index da18ed0f..edee74d4 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -149,7 +149,7 @@ extensions_available: disabled: [] 5.2: type: pecl - version: 1.4.0 + version: 1.6.1 5.3: type: pecl version: 1.9.3 From 207b78df6f056fcc86e3c0513ded0ae8a7369bc5 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 16:55:34 +0100 Subject: [PATCH 11/25] Fix gd build for PHP 5.2 and PHP 5.3 --- Dockerfiles/mods/Dockerfile-5.2 | 2 -- Dockerfiles/mods/Dockerfile-5.3 | 2 +- build/ansible/group_vars/all/mods.yml | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 7fea8aa8..c8d293e1 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -166,8 +166,6 @@ RUN set -eux \ && ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ -mkdir -p /usr/include/freetype2/freetype && \ -ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ \ # Installation: Version specific # Type: Built-in extension diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index e0f9e0f4..4876b341 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -165,7 +165,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ + && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ # Installation: Version specific # Type: Built-in extension # Custom: configure command diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index edee74d4..1982ebc7 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -279,14 +279,12 @@ extensions_available: ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ - mkdir -p /usr/include/freetype2/freetype && \ - ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ configure: --with-gd --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] 5.3: type: builtin - pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h + pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ configure: --with-gd --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] From 02c8c9d6ec4927b9de3ed91c344340b59c924321 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 17:15:30 +0100 Subject: [PATCH 12/25] Variablize architecture --- Dockerfiles/mods/Dockerfile-5.2 | 14 +++--- Dockerfiles/mods/Dockerfile-5.3 | 34 +++++++------- Dockerfiles/mods/Dockerfile-5.4 | 34 +++++++------- Dockerfiles/mods/Dockerfile-5.5 | 34 +++++++------- Dockerfiles/mods/Dockerfile-5.6 | 34 +++++++------- Dockerfiles/mods/Dockerfile-7.0 | 52 +++++++++++----------- Dockerfiles/mods/Dockerfile-7.1 | 52 +++++++++++----------- Dockerfiles/mods/Dockerfile-7.2 | 52 +++++++++++----------- Dockerfiles/mods/Dockerfile-7.3 | 52 +++++++++++----------- Dockerfiles/mods/Dockerfile-7.4 | 52 +++++++++++----------- Dockerfiles/mods/Dockerfile-8.0 | 50 ++++++++++----------- Dockerfiles/mods/Dockerfile-8.1 | 50 ++++++++++----------- Dockerfiles/mods/Dockerfile-8.2 | 50 ++++++++++----------- build/ansible/group_vars/all/mods.yml | 64 +++++++++++++-------------- 14 files changed, 312 insertions(+), 312 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index c8d293e1..314fc8c8 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -66,7 +66,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.2.so" "${EXTENSION_DIR}/ioncube.so" \ @@ -163,9 +163,9 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ -ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ -ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ \ # Installation: Version specific # Type: Built-in extension @@ -198,7 +198,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: imap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libkrb5* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -229,7 +229,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: ldap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libldap* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -324,7 +324,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_dblib -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 4876b341..f70d9f1e 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -71,7 +71,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.3.so" "${EXTENSION_DIR}/ioncube.so" \ @@ -165,7 +165,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ # Installation: Version specific # Type: Built-in extension # Custom: configure command @@ -186,7 +186,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gmp -------------------- RUN set -eux \ # Generic pre-command - && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ + && ln /usr/include/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/gmp.h /usr/include/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ @@ -207,7 +207,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: imap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libkrb5* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -236,7 +236,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: ldap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libldap* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -339,19 +339,19 @@ RUN set -eux \ # -------------------- Installing PHP Extension: oci8 -------------------- RUN set -eux \ # Generic pre-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ \ && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ # Installation: Generic # Type: Built-in extension @@ -359,7 +359,7 @@ RUN set -eux \ && docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/,${ORACLE_VERSION_MAJOR} \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \ # Generic post-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && 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) \ @@ -389,7 +389,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_dblib -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ @@ -732,7 +732,7 @@ RUN set -eux \ ### RUN set -eux \ # ---------- oci8 ---------- - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && 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) \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index b7f04b90..96171ffc 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -71,7 +71,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.4.so" "${EXTENSION_DIR}/ioncube.so" \ @@ -165,7 +165,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ # Installation: Version specific # Type: Built-in extension # Custom: configure command @@ -186,7 +186,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gmp -------------------- RUN set -eux \ # Generic pre-command - && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ + && ln /usr/include/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/gmp.h /usr/include/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install gmp \ @@ -207,7 +207,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: imap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libkrb5* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -236,7 +236,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: ldap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libldap* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -347,19 +347,19 @@ RUN set -eux \ # -------------------- Installing PHP Extension: oci8 -------------------- RUN set -eux \ # Generic pre-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ \ && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ # Installation: Generic # Type: Built-in extension @@ -367,7 +367,7 @@ RUN set -eux \ && docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/,${ORACLE_VERSION_MAJOR} \ && docker-php-ext-install oci8 \ # Generic post-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && 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) \ @@ -397,7 +397,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_dblib -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install pdo_dblib \ @@ -751,7 +751,7 @@ RUN set -eux \ ### RUN set -eux \ # ---------- oci8 ---------- - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && 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) \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 2c6a445a..0354c5e8 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -75,7 +75,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.5.so" "${EXTENSION_DIR}/ioncube.so" \ @@ -159,7 +159,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ # Installation: Version specific # Type: Built-in extension # Custom: configure command @@ -180,7 +180,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gmp -------------------- RUN set -eux \ # Generic pre-command - && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ + && ln /usr/include/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/gmp.h /usr/include/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ @@ -223,7 +223,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: imap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libkrb5* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -252,7 +252,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: ldap -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libldap* /usr/lib/ \ # Installation: Generic # Type: Built-in extension # Custom: configure command @@ -355,19 +355,19 @@ RUN set -eux \ # -------------------- Installing PHP Extension: oci8 -------------------- RUN set -eux \ # Generic pre-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ \ && rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ - https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.x86_64.rpm \ -&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.x86_64.rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ # Installation: Generic # Type: Built-in extension @@ -375,7 +375,7 @@ RUN set -eux \ && docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/,${ORACLE_VERSION_MAJOR} \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \ # Generic post-command - && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ + && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ && 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) \ @@ -402,7 +402,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_dblib -------------------- RUN set -eux \ # Generic pre-command - && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ @@ -778,7 +778,7 @@ RUN set -eux \ && sed -i'' 's|.* Date: Thu, 17 Mar 2022 17:59:11 +0100 Subject: [PATCH 13/25] Fix ioncube architecture install --- Dockerfiles/mods/Dockerfile-5.2 | 2 +- Dockerfiles/mods/Dockerfile-5.3 | 2 +- Dockerfiles/mods/Dockerfile-5.4 | 2 +- Dockerfiles/mods/Dockerfile-5.5 | 2 +- Dockerfiles/mods/Dockerfile-5.6 | 2 +- Dockerfiles/mods/Dockerfile-7.0 | 2 +- Dockerfiles/mods/Dockerfile-7.1 | 2 +- Dockerfiles/mods/Dockerfile-7.2 | 2 +- Dockerfiles/mods/Dockerfile-7.3 | 2 +- Dockerfiles/mods/Dockerfile-7.4 | 2 +- build/ansible/group_vars/all/mods.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 314fc8c8..a89d0b8b 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -66,7 +66,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.2.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index f70d9f1e..e88c85d0 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -71,7 +71,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.3.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 96171ffc..11359686 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -71,7 +71,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.4.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 0354c5e8..c45afef6 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -75,7 +75,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.5.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index bc73eb11..e081ee85 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -77,7 +77,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_5.6.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index a7d0d8f4..b0cd7503 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -94,7 +94,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_7.0.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 806dc434..9c5e3352 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -95,7 +95,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_7.1.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 23c9ce99..1475f9fc 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -95,7 +95,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_7.2.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 05879cbb..ac538798 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -94,7 +94,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_7.3.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 1e7494f9..12c70a73 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -94,7 +94,7 @@ RUN set -eux \ # Type: Custom extension && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ +&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_7.4.so" "${EXTENSION_DIR}/ioncube.so" \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 61e7cc50..29de5df1 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -452,7 +452,7 @@ extensions_available: command: | EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ && if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ - && curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU).tar.gz -L -o ioncube.tar.gz \ + && curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ && tar xvfz ioncube.tar.gz \ && cd ioncube \ && cp "ioncube_loader_lin_{{ php_version }}.so" "${EXTENSION_DIR}/ioncube.so" \ From c18bac4387a1e3800578c534c973597e5c6d6fa2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 18:24:08 +0100 Subject: [PATCH 14/25] Ensure dpkg-dev is installed --- Dockerfiles/base/Dockerfile-5.2 | 4 +++- Dockerfiles/base/Dockerfile-5.3 | 4 +++- Dockerfiles/base/Dockerfile-5.4 | 4 +++- Dockerfiles/base/Dockerfile-5.5 | 4 +++- Dockerfiles/base/Dockerfile-5.6 | 4 +++- Dockerfiles/base/Dockerfile-7.0 | 4 +++- Dockerfiles/base/Dockerfile-7.1 | 4 +++- Dockerfiles/base/Dockerfile-7.2 | 4 +++- Dockerfiles/base/Dockerfile-7.3 | 4 +++- Dockerfiles/base/Dockerfile-7.4 | 4 +++- Dockerfiles/base/Dockerfile-8.0 | 4 +++- Dockerfiles/base/Dockerfile-8.1 | 4 +++- Dockerfiles/base/Dockerfile-8.2 | 4 +++- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 4 +++- 14 files changed, 42 insertions(+), 14 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 944b505b..0496cb97 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index 77d24030..9ba4d1db 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index 48f52717..a36d13b9 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -52,7 +52,9 @@ RUN set -eux \ } | 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 procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 5a633ea0..116e8417 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -52,7 +52,9 @@ RUN set -eux \ } | 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 procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index 071ede02..4efd27e6 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 25381f5c..81bb3fe6 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 28cfdb92..28d53cc8 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index 5626b780..42bdf177 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 1662f153..550e88de 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-7.4 b/Dockerfiles/base/Dockerfile-7.4 index 2fa3fbe8..bf56ce7a 100644 --- a/Dockerfiles/base/Dockerfile-7.4 +++ b/Dockerfiles/base/Dockerfile-7.4 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.0 b/Dockerfiles/base/Dockerfile-8.0 index efa3d1d5..f631dfa8 100644 --- a/Dockerfiles/base/Dockerfile-8.0 +++ b/Dockerfiles/base/Dockerfile-8.0 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.1 b/Dockerfiles/base/Dockerfile-8.1 index 4f52670e..fe45252d 100644 --- a/Dockerfiles/base/Dockerfile-8.1 +++ b/Dockerfiles/base/Dockerfile-8.1 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/base/Dockerfile-8.2 b/Dockerfiles/base/Dockerfile-8.2 index 001d3f7a..3d8e1d57 100644 --- a/Dockerfiles/base/Dockerfile-8.2 +++ b/Dockerfiles/base/Dockerfile-8.2 @@ -45,7 +45,9 @@ RUN set -eux \ ### RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index fa15ece2..b29da3cc 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -66,7 +66,9 @@ RUN set -eux \ {% endif %} RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ - && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + dpkg-dev \ + procps \ && rm -rf /var/lib/apt/lists/* From df59c7b7bc6a9d8af295c7e98628232c66cf1b10 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 18:35:37 +0100 Subject: [PATCH 15/25] Show commands used in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f907975f..6c193d53 100644 --- a/Makefile +++ b/Makefile @@ -424,4 +424,4 @@ _check-image-exists: _pull-base-image: @echo "Pulling root image for PHP ${VERSION}" - @docker pull --platform $(ARCH) $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';) + docker pull --platform $(ARCH) $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';) From 45e25586e3317b0b3ad73ccafbda21c717f199a3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 18:39:15 +0100 Subject: [PATCH 16/25] Removed mongodb extension from PHP 5.3 due to build errors --- CHANGELOG.md | 1 + Dockerfiles/mods/Dockerfile-5.3 | 13 ------------- README.md | 2 +- build/ansible/group_vars/all/mods.yml | 5 +---- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c0f1fb1..7a02401c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ #### Changed - Changed PHP 5.2 and PHP 5.3 base images to Debian stretch - Removed photoncms binaries (their GitHub organization went private) +- Removed `mongodb` extension from PHP 5.3 due to build errors ## Release 0.134 diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index e88c85d0..7f891b6c 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -306,17 +306,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: mongodb -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install mongodb-0.6.3 \ - # Enabling - && docker-php-ext-enable mongodb \ - && true - - # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ # Installation: Generic @@ -823,8 +812,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcached$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ - && php -m | grep -oiE '^mongodb$' \ - && php-fpm -m | grep -oiE '^mongodb$' \ && php -m | grep -oiE '^mysql$' \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ diff --git a/README.md b/README.md index 248e0101..d7df87a3 100644 --- a/README.md +++ b/README.md @@ -664,7 +664,7 @@ Check out this table to see which Docker image provides what PHP modules. 5.3 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.4 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 29de5df1..9a799dbf 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -607,10 +607,7 @@ extensions_available: command: yes yes | pecl install mongo build_dep: [libssl-dev, libsasl2-dev] mongodb: - disabled: [5.2] - 5.3: - type: pecl - version: 0.6.3 + disabled: [5.2, 5.3] 5.4: type: pecl version: 1.2.11 From a7b96c7cf53468f05e3affd255a8217421cae2f2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 18:39:31 +0100 Subject: [PATCH 17/25] Disable PHP 5.2 in arm64 builds --- .github/workflows/arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml index 7fd57eda..a72ed903 100644 --- a/.github/workflows/arm64.yml +++ b/.github/workflows/arm64.yml @@ -25,7 +25,7 @@ jobs: fail-fast: False matrix: version: - - '5.2' + #- '5.2' # No arm64 version available - '5.3' - '5.4' - '5.5' From b937b99641cfa7cdf995c988fb8a7ac57d09bf83 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 18:49:20 +0100 Subject: [PATCH 18/25] Fix syntax error --- Dockerfiles/mods/Dockerfile-5.2 | 2 +- build/ansible/group_vars/all/mods.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index a89d0b8b..c911315c 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -165,7 +165,7 @@ RUN set -eux \ # Version specific pre-command && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ -ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ \ # Installation: Version specific # Type: Built-in extension diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 9a799dbf..a2ceeafd 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -278,7 +278,7 @@ extensions_available: pre: | ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ - ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ configure: --with-gd --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] From 361192deee5125bddbd0365ba5fa60c88fb82762 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 19:29:45 +0100 Subject: [PATCH 19/25] Fix debs for PHP 5.2 and PHP 5.3 --- Dockerfiles/mods/Dockerfile-5.2 | 12 +++++++----- Dockerfiles/mods/Dockerfile-5.3 | 14 ++++++++------ Dockerfiles/mods/Dockerfile-5.4 | 3 ++- Dockerfiles/mods/Dockerfile-5.5 | 3 ++- Dockerfiles/mods/Dockerfile-5.6 | 3 +-- build/ansible/group_vars/all/mods.yml | 24 ++++++++++++------------ 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index c911315c..8b405dea 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -37,6 +37,7 @@ RUN set -eux \ libssl-dev \ libtidy-dev \ libvpx-dev \ + libwebp-dev \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -576,18 +577,19 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu52 \ + libicu57 \ libjpeg62-turbo \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ - libpng12-0 \ + libpng16-16 \ libpq5 \ librabbitmq4 \ librecode0 \ libsybdb5 \ - libtidy-0.99-0 \ - libvpx1 \ + libtidy5 \ + libvpx4 \ + libwebp6 \ libxpm4 \ libxslt1.1 \ snmp \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 7f891b6c..c1cd219d 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -40,6 +40,7 @@ RUN set -eux \ libssl-dev \ libtidy-dev \ libvpx-dev \ + libwebp-dev \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -691,20 +692,21 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu52 \ + libicu57 \ libjpeg62-turbo \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ - libnghttp2-5 \ - libpng12-0 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ librabbitmq4 \ librdkafka1 \ librecode0 \ libsybdb5 \ - libtidy-0.99-0 \ - libvpx1 \ + libtidy5 \ + libvpx4 \ + libwebp6 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 11359686..9643cbca 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -319,8 +319,9 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index c45afef6..f5db2999 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -327,8 +327,9 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index e081ee85..036a1438 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -343,9 +343,8 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: Built-in extension - # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index a2ceeafd..c83fd813 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -280,14 +280,12 @@ extensions_available: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ configure: --with-gd --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.3: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ configure: --with-gd --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.4: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ @@ -419,10 +417,10 @@ extensions_available: intl: 5.2: type: pecl - run_dep: [libicu52] + run_dep: [libicu57] 5.3: type: builtin - run_dep: [libicu52] + run_dep: [libicu57] 5.4: type: builtin run_dep: [libicu52] @@ -648,12 +646,15 @@ extensions_available: mysql: already_avail: [5.2, 5.3] disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions - 5.6: + 5.4: type: builtin - run_dep: [libmariadbclient18] - all: + run_dep: [libmysqlclient18] + 5.5: type: builtin run_dep: [libmysqlclient18] + all: + type: builtin + run_dep: [libmariadbclient18] mysqli: already_avail: [5.2] all: @@ -1084,7 +1085,6 @@ extensions_available: 5.3: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] 5.4: type: pecl version: 1.9.23 @@ -1119,10 +1119,10 @@ extensions_available: tidy: 5.2: type: builtin - run_dep: [libtidy-0.99-0] + run_dep: [libtidy5] 5.3: type: builtin - run_dep: [libtidy-0.99-0] + run_dep: [libtidy5] 5.4: type: builtin run_dep: [libtidy-0.99-0] From f36d0818b0d1706848376b94da5b1b5b69ac879e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 20:29:46 +0100 Subject: [PATCH 20/25] Removed ioncube extension for PHP 5.2, PHP 5.3 and PHP 5.4 --- CHANGELOG.md | 1 + Dockerfiles/mods/Dockerfile-5.2 | 17 ----------------- Dockerfiles/mods/Dockerfile-5.3 | 17 ----------------- Dockerfiles/mods/Dockerfile-5.4 | 17 ----------------- README.md | 6 +++--- build/ansible/group_vars/all/mods.yml | 4 +++- 6 files changed, 7 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a02401c..3310f1c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Changed PHP 5.2 and PHP 5.3 base images to Debian stretch - Removed photoncms binaries (their GitHub organization went private) - Removed `mongodb` extension from PHP 5.3 due to build errors +- Removed `ioncube` extension for PHP 5.2, PHP 5.3 and PHP 5.4 (arm64 only supported from PHP 5.5 onwards) ## Release 0.134 diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 8b405dea..b045dc73 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -61,23 +61,6 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi -# -------------------- Installing PHP Extension: ioncube -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Custom extension - && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ -&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ -&& tar xvfz ioncube.tar.gz \ -&& cd ioncube \ -&& cp "ioncube_loader_lin_5.2.so" "${EXTENSION_DIR}/ioncube.so" \ -&& cd ../ \ -&& rm -rf ioncube \ -&& rm -rf ioncube.tar.gz \ - \ - && true - - # -------------------- Installing PHP Extension: amqp -------------------- RUN set -eux \ # Installation: Version specific diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index c1cd219d..1a05e887 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -66,23 +66,6 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi -# -------------------- Installing PHP Extension: ioncube -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Custom extension - && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ -&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ -&& tar xvfz ioncube.tar.gz \ -&& cd ioncube \ -&& cp "ioncube_loader_lin_5.3.so" "${EXTENSION_DIR}/ioncube.so" \ -&& cd ../ \ -&& rm -rf ioncube \ -&& rm -rf ioncube.tar.gz \ - \ - && true - - # -------------------- Installing PHP Extension: amqp -------------------- RUN set -eux \ # Installation: Version specific diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 9643cbca..d4918087 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -65,23 +65,6 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi -# -------------------- Installing PHP Extension: ioncube -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Custom extension - && EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \ -&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \ -&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(dpkg-architecture --query DEB_HOST_GNU_CPU | sed 's/_/-/g').tar.gz -L -o ioncube.tar.gz \ -&& tar xvfz ioncube.tar.gz \ -&& cd ioncube \ -&& cp "ioncube_loader_lin_5.4.so" "${EXTENSION_DIR}/ioncube.so" \ -&& cd ../ \ -&& rm -rf ioncube \ -&& rm -rf ioncube.tar.gz \ - \ - && true - - # -------------------- Installing PHP Extension: amqp -------------------- RUN set -eux \ # Installation: Version specific diff --git a/README.md b/README.md index d7df87a3..9d50be14 100644 --- a/README.md +++ b/README.md @@ -659,17 +659,17 @@ Check out this table to see which Docker image provides what PHP modules. 5.2 ctype, curl, date, dom, filter, hash, iconv, json, libxml, mbstring, mysql, mysqli, openssl, pcre, PDO, pdo_mysql, pdo_sqlite, posix, readline, Reflection, session, SimpleXML, soap, SPL, SQLite, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, OAuth, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, OAuth, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib 5.3 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.4 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.5 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index c83fd813..8c66beb4 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -444,7 +444,9 @@ extensions_available: build_dep: [libicu-dev] run_dep: [libicu67] ioncube: - disabled: [8.0, 8.1, 8.2] + # ioncube on amd64 is only available from 4.1 up to 7.4 + # ioncube on arm64 is only available from 5.5 up to 7.4 + disabled: [5.2, 5.3, 5.4, 8.0, 8.1, 8.2] all: type: custom command: | From fdc024fac3c12b793425c16e761d7d35da663428 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 21:05:17 +0100 Subject: [PATCH 21/25] Fix debs for PHP 5.2 and PHP 5.3 --- Dockerfiles/work/Dockerfile-5.2 | 2 +- Dockerfiles/work/Dockerfile-5.3 | 2 +- build/ansible/group_vars/all/work.yml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 055ec918..fcd92d52 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -63,7 +63,7 @@ RUN set -eux \ && 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 http://apt.postgresql.org/pub/repos/apt/ bullseye-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 \ \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index aea8394a..d61ddfcd 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -63,7 +63,7 @@ RUN set -eux \ && 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 http://apt.postgresql.org/pub/repos/apt/ bullseye-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 \ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 8cd41b05..ecf41221 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -170,6 +170,12 @@ apt_repositories_available: deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 pgsql: + 5.2: + 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.3: + 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.4: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: From 8b9dbdf36b1f7be414d7d39c65199619cb0b9892 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 22:08:45 +0100 Subject: [PATCH 22/25] Fix build of wkhtmltopdf --- Dockerfiles/work/Dockerfile-5.2 | 4 +-- Dockerfiles/work/Dockerfile-5.3 | 4 +-- build/ansible/group_vars/all/work.yml | 48 +++++---------------------- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index fcd92d52..3ab3c17c 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -251,10 +251,10 @@ RUN set -eux \ \ \ # -------------------- 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/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index d61ddfcd..e8fc5dc0 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -301,10 +301,10 @@ RUN set -eux \ \ \ # -------------------- 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/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index ecf41221..a9234be8 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -937,67 +937,37 @@ software_available: post: chmod +x /usr/local/bin/symfony wkhtmltopdf: check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" - 5.2: - pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" - 5.3: - pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" 5.4: pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" - 5.5: - pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" - 7.1: - command: | - DEBIAN_FRONTEND=noninteractive apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - 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 \ - 7.2: - command: | - DEBIAN_FRONTEND=noninteractive apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - 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 \ - 7.3: - command: | - DEBIAN_FRONTEND=noninteractive apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - 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 \ - 7.4: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + 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 \ - 8.0: + 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 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + 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 \ - 8.1: + 5.6: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + 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 \ - 8.2: + 7.0: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + 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 \ @@ -1006,7 +976,7 @@ software_available: 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 \ + 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 \ From 98569594bfcedfe2e424bcb37625a342e499ca80 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 17 Mar 2022 23:09:35 +0100 Subject: [PATCH 23/25] Make alien respect architecture --- Dockerfiles/mods/Dockerfile-5.3 | 12 ++++++++++-- Dockerfiles/mods/Dockerfile-5.4 | 12 ++++++++++-- Dockerfiles/mods/Dockerfile-5.5 | 12 ++++++++++-- Dockerfiles/mods/Dockerfile-5.6 | 12 ++++++++++-- Dockerfiles/mods/Dockerfile-7.0 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-7.1 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-7.2 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-7.3 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-7.4 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-8.0 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-8.1 | 24 ++++++++++++++++++++---- Dockerfiles/mods/Dockerfile-8.2 | 24 ++++++++++++++++++++---- build/ansible/group_vars/all/mods.yml | 24 ++++++++++++++++++++---- 13 files changed, 220 insertions(+), 44 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 1a05e887..69c73c85 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -321,8 +321,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index d4918087..f761b12f 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -340,8 +340,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f5db2999..f6c083c3 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -365,8 +365,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 036a1438..1bd55e54 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -380,8 +380,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index b0cd7503..905272a6 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -378,8 +378,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -453,8 +461,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 9c5e3352..487f63d0 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -379,8 +379,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -454,8 +462,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 1475f9fc..1f98ae35 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -381,8 +381,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -456,8 +464,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index ac538798..d025b155 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -371,8 +371,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -446,8 +454,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 12c70a73..486e633d 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -375,8 +375,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -450,8 +458,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index e9c61fbf..b2d6f831 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -349,8 +349,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -424,8 +432,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index a5b850fa..826cfa50 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -323,8 +323,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -401,8 +409,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index 37c29ee7..65adccc3 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -323,8 +323,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ \ @@ -401,8 +409,16 @@ RUN set -eux \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ -&& alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ +&& alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 8c66beb4..19c907f1 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -699,8 +699,16 @@ extensions_available: https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ - && alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ - && alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ + && alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ + && alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ build_dep: [alien, libaio-dev] @@ -791,8 +799,16 @@ extensions_available: https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && curl -o /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/getPackage/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ - && alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ - && alien -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ + && alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ + && alien \ + -v \ + --target=$( dpkg --print-architecture ) \ + -i /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture \ + --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-basiclite-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && rm -f /tmp/oracle-instantclient${ORACLE_VERSION_MAJOR}-devel-${ORACLE_VERSION_FULL}.$(dpkg-architecture --query DEB_HOST_GNU_CPU).rpm \ && (ln -s /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ From 6b4596688c478358e2161af86802dc62c855c600 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 01:19:10 +0100 Subject: [PATCH 24/25] Removed codeception from PHP 5.3 --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.3 | 5 ----- build/ansible/group_vars/all/work.yml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3310f1c8..22e92580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Removed photoncms binaries (their GitHub organization went private) - Removed `mongodb` extension from PHP 5.3 due to build errors - Removed `ioncube` extension for PHP 5.2, PHP 5.3 and PHP 5.4 (arm64 only supported from PHP 5.5 onwards) +- Removed `codeception` from PHP 5.3 ## Release 0.134 diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index e8fc5dc0..80d4d670 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -359,10 +359,6 @@ RUN set -eux \ ### Install Composer (PHP) ### RUN set -eux \ -# -------------------- codeception -------------------- - && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require codeception/codeception \ - && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ - \ # -------------------- prestissimo -------------------- && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-1 global require hirak/prestissimo \ \ @@ -545,7 +541,6 @@ RUN set -eux \ && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- PIP -------------------- && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index a9234be8..743a8ee9 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -224,7 +224,7 @@ composer_available: link: asgardcms version: 2 codeception: - disabled: [5.2, 8.0, 8.1, 8.2] + disabled: [5.2, 5.3, 8.0, 8.1, 8.2] check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' name: codeception/codeception link: codecept From ac508caee4e3030026cc465e3e043cda9a775c74 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 01:23:47 +0100 Subject: [PATCH 25/25] Remove arm64 test --- .github/workflows/arm64.yml | 352 ------------------------------------ 1 file changed, 352 deletions(-) delete mode 100644 .github/workflows/arm64.yml diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml deleted file mode 100644 index a72ed903..00000000 --- a/.github/workflows/arm64.yml +++ /dev/null @@ -1,352 +0,0 @@ ---- - -# ------------------------------------------------------------------------------------------------- -# Job Name -# ------------------------------------------------------------------------------------------------- -name: build-arm64 - - -# ------------------------------------------------------------------------------------------------- -# When to run -# ------------------------------------------------------------------------------------------------- -on: - # Runs on Push - push: - - -# ------------------------------------------------------------------------------------------------- -# What to run -# ------------------------------------------------------------------------------------------------- -jobs: - build: - name: "[ PHP-${{ matrix.version }} (arm64) ]" - runs-on: ubuntu-latest - strategy: - fail-fast: False - matrix: - version: - #- '5.2' # No arm64 version available - - '5.3' - - '5.4' - - '5.5' - - '5.6' - - '7.0' - - '7.1' - - '7.2' - - '7.3' - - '7.4' - - '8.0' - - '8.1' - - '8.2' - steps: - - # ------------------------------------------------------------ - # Setup repository - # ------------------------------------------------------------ - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set variables - id: vars - run: | - - # Retrieve git info (tags, etc) - git fetch --all - - # Branch, Tag or Commit - GIT_TYPE="$( \ - curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ - | sh \ - | grep '^GIT_TYPE' \ - | sed 's|.*=||g' \ - )" - # Branch name, Tag name or Commit Hash - GIT_SLUG="$( \ - curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ - | sh \ - | grep '^GIT_NAME' \ - | sed 's|.*=||g' \ - )" - # Docker Tag - if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then - DOCKER_TAG_BASE="${VERSION}-base" - DOCKER_TAG_MODS="${VERSION}-mods" - DOCKER_TAG_PROD="${VERSION}-prod" - DOCKER_TAG_WORK="${VERSION}-work" - else - DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}" - DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}" - DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}" - DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}" - fi - - # Output - echo "GIT_TYPE=${GIT_TYPE}" - echo "GIT_SLUG=${GIT_SLUG}" - echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" - echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" - echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" - echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" - - # Export variable - # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files - echo "GIT_TYPE=${GIT_TYPE}" >> ${GITHUB_ENV} - echo "GIT_SLUG=${GIT_SLUG}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV} - env: - VERSION: ${{ matrix.version }} - - - name: "[SETUP] Setup QEMU environment" - uses: docker/setup-qemu-action@v1 - with: - image: tonistiigi/binfmt:latest - platforms: all - - - # ------------------------------------------------------------ - # Base - # ------------------------------------------------------------ - - name: Build Base - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make _pull-base-image VERSION=${VERSION} ARCH=linux/arm64 - retry make build-base VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Base - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-base VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Mods - # ------------------------------------------------------------ - - name: Build Mods - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-mods VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Mods - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-mods VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Prod - # ------------------------------------------------------------ - - name: Build Prod - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-prod VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Prod - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-prod VERSION=${VERSION} - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Work - # ------------------------------------------------------------ - - name: Build Work - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-work VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Work - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-work VERSION=${VERSION} - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Diff README.md - # ------------------------------------------------------------ - - name: Diff README.md - run: | - make gen-readme VERSION=${VERSION} - git diff --quiet || { echo "Build Changes"; git diff; git status; false; } - env: - VERSION: ${{ matrix.version }} - - - # ------------------------------------------------------------ - # Deploy - # ------------------------------------------------------------ - #- name: Publish images (only repo owner) - # run: | - # retry() { - # for n in $(seq ${RETRIES}); do - # echo "[${n}/${RETRIES}] ${*}"; - # if eval "${*}"; then - # echo "[SUCC] ${n}/${RETRIES}"; - # return 0; - # fi; - # sleep ${PAUSE}; - # echo "[FAIL] ${n}/${RETRIES}"; - # done; - # return 1; - # } - - # # Output - # echo "GIT_TYPE=${GIT_TYPE}" - # echo "GIT_SLUG=${GIT_SLUG}" - # echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" - # echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" - # echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" - # echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" - - # # Tag image - # retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}" - # retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}" - # retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}" - # retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}" - # docker images - - # # Login - # retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }} - - # # Push - # retry make push TAG=${DOCKER_TAG_BASE} - # retry make push TAG=${DOCKER_TAG_MODS} - # retry make push TAG=${DOCKER_TAG_PROD} - # retry make push TAG=${DOCKER_TAG_WORK} - # env: - # VERSION: ${{ matrix.version }} - # RETRIES: 20 - # PAUSE: 10 - # # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions - # if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id - # && ( - # (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) - # || - # (github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) - # || - # (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-')) - # )