From bff0c13146c279495181c75ee51adab345c5e146 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 12 Feb 2024 18:20:00 +0300 Subject: [PATCH] php some rework --- Makefile | 18 ++++++++++- bin/dotnet/Program.cs | 2 +- .../2.7/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../2.7/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.10/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.10/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.11/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.11/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.12/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.12/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.13/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.13/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.6/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.6/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.7/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.7/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.8/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.8/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../3.9/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../3.9/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 2 +- .../slim/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../slim/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../slim/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../slim/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- .../slim/etc/apt/apt.conf.d/96-apt-retries | 2 +- .../slim/etc/apt/apt.conf.d/97-allow-cert-exp | 4 +-- linux/ecosystem/php/php7.0/Dockerfile | 30 ++++++++++++------- linux/ecosystem/php/php7.1/Dockerfile | 30 ++++++++++++------- linux/ecosystem/php/php7.2/Dockerfile | 30 ++++++++++++------- linux/ecosystem/php/php7.3/Dockerfile | 30 ++++++++++++------- linux/ecosystem/php/php7.4/Dockerfile | 30 ++++++++++++------- linux/ecosystem/php/php8.0/Dockerfile | 15 ++++++---- linux/ecosystem/php/php8.1/Dockerfile | 16 ++++++---- linux/ecosystem/php/php8.2/Dockerfile | 15 ++++++---- linux/ecosystem/php/php8.3/Dockerfile | 15 ++++++---- 41 files changed, 202 insertions(+), 117 deletions(-) diff --git a/Makefile b/Makefile index 6648f5d24..570cc21f5 100644 --- a/Makefile +++ b/Makefile @@ -247,6 +247,8 @@ ecosystem-images: make ecosystem-nginx-images make ecosystem-vscode-server-images make ecosystem-ninjam-image + make bundle-jira + make bundle-atlassian-latest advanced-pyhton-images: make advanced-pyhton-images-main @@ -1338,6 +1340,20 @@ bundle-gitlab: @echo "=======================================" make ecosystem-gitlab-runner-images +bundle-bitbucket: + @echo "=======================================" + @echo "===== Building All Bitbucket images =====" + @echo "=======================================" + make ecosystem-bitbucket-1-images + make ecosystem-bitbucket-2-images + make ecosystem-bitbucket-3-images + make ecosystem-bitbucket-4-images + make ecosystem-bitbucket-5-images + make ecosystem-bitbucket-6-images + make ecosystem-bitbucket-7-images + make ecosystem-bitbucket-8-images + make ecosystem-bitbucket-9-images + bundle-jira: @echo "=======================================" @echo "===== Building All Jira images =====" @@ -1349,7 +1365,7 @@ bundle-jira: make ecosystem-jira-8-images make ecosystem-jira-9-images -bundle-atlassian-altest: +bundle-atlassian-latest: @echo "==============================================" @echo "===== Building Atlassian Latest images =====" @echo "==============================================" diff --git a/bin/dotnet/Program.cs b/bin/dotnet/Program.cs index 1b28f17e6..bd244f993 100644 --- a/bin/dotnet/Program.cs +++ b/bin/dotnet/Program.cs @@ -1,4 +1,4 @@ -namespace Epicmorg.DockerGenerator +namespace Epicmorg.DockerGenerator { using System; using System.IO; diff --git a/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/2.7/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.10/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.11/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.12/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.13/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.6/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.7/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.8/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/96-apt-retries b/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/advanced/python/main/3.9/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/apt.conf.d/97-allow-cert-exp index feff33be1..7e2adc92c 100644 --- a/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/06-squeeze/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Peer "false"; Acquire::https::Verify-Host "false"; \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/etc/apt/apt.conf.d/97-allow-cert-exp index feff33be1..7e2adc92c 100644 --- a/linux/ecosystem/epicmorg/debian/07-wheezy/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/07-wheezy/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Peer "false"; Acquire::https::Verify-Host "false"; \ No newline at end of file diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/09-stretch/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/96-apt-retries b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/96-apt-retries index 666e4e213..73262ccc3 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/96-apt-retries +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/96-apt-retries @@ -1 +1 @@ -Acquire::Retries "9"; +Acquire::Retries "9"; diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/97-allow-cert-exp b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/97-allow-cert-exp index 9c02e2ac9..e7ec46810 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/97-allow-cert-exp +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/97-allow-cert-exp @@ -1,2 +1,2 @@ -Acquire::https::Verify-Peer "false"; -Acquire::https::Verify-Host "false"; +Acquire::https::Verify-Peer "false"; +Acquire::https::Verify-Host "false"; diff --git a/linux/ecosystem/php/php7.0/Dockerfile b/linux/ecosystem/php/php7.0/Dockerfile index 111eda796..c7bd5722c 100644 --- a/linux/ecosystem/php/php7.0/Dockerfile +++ b/linux/ecosystem/php/php7.0/Dockerfile @@ -38,7 +38,7 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ - php-pear \ +# php-pear \ php7.0 \ php7.0-common \ php7.0-dev \ @@ -47,11 +47,16 @@ RUN apt-get update && \ php7.0-xml \ php7.0-cgi && \ update-alternatives --set php /usr/bin/php7.0 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # preparing p4src @@ -104,7 +109,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php7.0 \ php7.0-common \ php7.0-dev \ @@ -147,11 +152,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.0 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php7.1/Dockerfile b/linux/ecosystem/php/php7.1/Dockerfile index 53ffeb1e9..e76515f82 100644 --- a/linux/ecosystem/php/php7.1/Dockerfile +++ b/linux/ecosystem/php/php7.1/Dockerfile @@ -38,7 +38,7 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ - php-pear \ +# php-pear \ php7.1 \ php7.1-common \ php7.1-dev \ @@ -47,11 +47,16 @@ RUN apt-get update && \ php7.1-xml \ php7.1-cgi && \ update-alternatives --set php /usr/bin/php7.1 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # preparing p4src @@ -104,7 +109,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php7.1 \ php7.1-common \ php7.1-dev \ @@ -147,11 +152,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.1 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index b938108b7..8c5cd792c 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -38,7 +38,7 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ - php-pear \ +# php-pear \ php7.2 \ php7.2-common \ php7.2-dev \ @@ -47,11 +47,16 @@ RUN apt-get update && \ php7.2-xml \ php7.2-cgi && \ update-alternatives --set php /usr/bin/php7.2 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # preparing p4src @@ -104,7 +109,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php7.2 \ php7.2-common \ php7.2-dev \ @@ -147,11 +152,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.2 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index b247ba76a..4a0e7624a 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -38,7 +38,7 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ - php-pear \ +# php-pear \ php7.3 \ php7.3-common \ php7.3-dev \ @@ -47,11 +47,16 @@ RUN apt-get update && \ php7.3-xml \ php7.3-cgi && \ update-alternatives --set php /usr/bin/php7.3 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # preparing p4src @@ -104,7 +109,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php7.3 \ php7.3-common \ php7.3-dev \ @@ -147,11 +152,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.3 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index 92e00ddba..8d96e0672 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -37,7 +37,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ smbclient libsmbclient libsmbclient-dev \ - php-pear \ +# php-pear \ php7.4 \ php7.4-common \ php7.4-dev \ @@ -46,11 +46,16 @@ RUN apt-get update && \ php7.4-xml \ php7.4-cgi && \ update-alternatives --set php /usr/bin/php7.4 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # preparing p4src @@ -110,7 +115,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php7.4 \ php7.4-common \ php7.4-dev \ @@ -152,11 +157,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.4 && \ - pear upgrade && \ +# pear upgrade && \ pear update-channels && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index aaa1949e1..3a13e00e6 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php8.0 \ php8.0-common \ php8.0-dev \ @@ -60,11 +60,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.0 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php8.1/Dockerfile b/linux/ecosystem/php/php8.1/Dockerfile index fcaece7b2..98c5eb79a 100644 --- a/linux/ecosystem/php/php8.1/Dockerfile +++ b/linux/ecosystem/php/php8.1/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php8.1 \ php8.1-common \ php8.1-dev \ @@ -60,11 +60,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.1 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions @@ -212,4 +217,3 @@ RUN apt clean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb && \ rm -rfv /tmp/* - diff --git a/linux/ecosystem/php/php8.2/Dockerfile b/linux/ecosystem/php/php8.2/Dockerfile index 3229e5a93..165f88741 100644 --- a/linux/ecosystem/php/php8.2/Dockerfile +++ b/linux/ecosystem/php/php8.2/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php8.2 \ php8.2-common \ php8.2-dev \ @@ -60,11 +60,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.2 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions diff --git a/linux/ecosystem/php/php8.3/Dockerfile b/linux/ecosystem/php/php8.3/Dockerfile index 633896c0a..a1c3176e9 100644 --- a/linux/ecosystem/php/php8.3/Dockerfile +++ b/linux/ecosystem/php/php8.3/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ - php-pear \ +# php-pear \ php8.3 \ php8.3-common \ php8.3-dev \ @@ -50,11 +50,16 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php8.3 && \ +# pear upgrade && \ pear update-channels && \ - pear upgrade && \ - pecl channel-update pecl.php.net && \ - php -m && \ - php -v + pecl channel-update pecl.php.noninteractive + +RUN echo "=============================================" && \ + echo php -m $(php -m) && \ + echo php -v $(php -v) && \ + echo pear version $(pear version) && \ + echo pear list $(pear list) && \ + echo "=============================================" ################################################################## # Enabling extensions