Changed PHP 5.2 and PHP 5.3 base images to Debian stretch

2025-12-10 11:01:14 +00:00 · 2022-03-17 14:55:22 +01:00
parent 42a0a4f7ac
commit 1640850b75
8 changed files with 20 additions and 42 deletions
--- 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
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
 	&& { \
--- 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 \
--- 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: