From 10d5fff6b424b084ee3f43fd65ea054611337ba8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 4 Dec 2022 12:39:16 +0100 Subject: [PATCH 1/3] Update Friendica to php 8.0 --- 2022.10/apache/Dockerfile | 2 +- 2022.10/fpm-alpine/Dockerfile | 2 +- 2022.10/fpm/Dockerfile | 2 +- 2022.12-dev/apache/Dockerfile | 2 +- 2022.12-dev/fpm-alpine/Dockerfile | 2 +- 2022.12-dev/fpm/Dockerfile | 2 +- update.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2022.10/apache/Dockerfile b/2022.10/apache/Dockerfile index 3bb1aec..92e9a11 100644 --- a/2022.10/apache/Dockerfile +++ b/2022.10/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-apache-bullseye +FROM php:8.0-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm-alpine/Dockerfile b/2022.10/fpm-alpine/Dockerfile index 707667b..a101c06 100644 --- a/2022.10/fpm-alpine/Dockerfile +++ b/2022.10/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.4-fpm-alpine +FROM php:8.0-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm/Dockerfile b/2022.10/fpm/Dockerfile index 226b374..8cc83bd 100644 --- a/2022.10/fpm/Dockerfile +++ b/2022.10/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-fpm-bullseye +FROM php:8.0-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.12-dev/apache/Dockerfile b/2022.12-dev/apache/Dockerfile index 77d69c0..ccb4c72 100644 --- a/2022.12-dev/apache/Dockerfile +++ b/2022.12-dev/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-apache-bullseye +FROM php:8.0-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.12-dev/fpm-alpine/Dockerfile b/2022.12-dev/fpm-alpine/Dockerfile index 255c791..72567b7 100644 --- a/2022.12-dev/fpm-alpine/Dockerfile +++ b/2022.12-dev/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.4-fpm-alpine +FROM php:8.0-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.12-dev/fpm/Dockerfile b/2022.12-dev/fpm/Dockerfile index 9973792..58ed29a 100644 --- a/2022.12-dev/fpm/Dockerfile +++ b/2022.12-dev/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-fpm-bullseye +FROM php:8.0-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index d5f5624..040525c 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -eo pipefail declare -A php_version=( - [default]='7.4' + [default]='8.0' ) declare -A cmd=( From f2fc626f3e53f2db8b3d1bb277ea5488ebcee4de Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 4 Dec 2022 12:44:48 +0100 Subject: [PATCH 2/3] Make 2022.10 using php7.4, just in case ... --- 2022.10/apache/Dockerfile | 2 +- 2022.10/fpm-alpine/Dockerfile | 2 +- 2022.10/fpm/Dockerfile | 2 +- update.sh | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/2022.10/apache/Dockerfile b/2022.10/apache/Dockerfile index 92e9a11..3bb1aec 100644 --- a/2022.10/apache/Dockerfile +++ b/2022.10/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.0-apache-bullseye +FROM php:7.4-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm-alpine/Dockerfile b/2022.10/fpm-alpine/Dockerfile index a101c06..707667b 100644 --- a/2022.10/fpm-alpine/Dockerfile +++ b/2022.10/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:8.0-fpm-alpine +FROM php:7.4-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm/Dockerfile b/2022.10/fpm/Dockerfile index 8cc83bd..226b374 100644 --- a/2022.10/fpm/Dockerfile +++ b/2022.10/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.0-fpm-bullseye +FROM php:7.4-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index 040525c..3bfcbeb 100755 --- a/update.sh +++ b/update.sh @@ -2,6 +2,7 @@ set -eo pipefail declare -A php_version=( + [2022.10]='7.4' [default]='8.0' ) From 39791e62fd6ea0b19ac10663c0913a3cb149dc0f Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 4 Dec 2022 12:49:40 +0100 Subject: [PATCH 3/3] php7 containers are now gone .. forever :-/ --- 2022.10/apache/Dockerfile | 2 +- 2022.10/fpm-alpine/Dockerfile | 2 +- 2022.10/fpm/Dockerfile | 2 +- update.sh | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/2022.10/apache/Dockerfile b/2022.10/apache/Dockerfile index 3bb1aec..92e9a11 100644 --- a/2022.10/apache/Dockerfile +++ b/2022.10/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-apache-bullseye +FROM php:8.0-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm-alpine/Dockerfile b/2022.10/fpm-alpine/Dockerfile index 707667b..a101c06 100644 --- a/2022.10/fpm-alpine/Dockerfile +++ b/2022.10/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:7.4-fpm-alpine +FROM php:8.0-fpm-alpine # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/2022.10/fpm/Dockerfile b/2022.10/fpm/Dockerfile index 226b374..8cc83bd 100644 --- a/2022.10/fpm/Dockerfile +++ b/2022.10/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:7.4-fpm-bullseye +FROM php:8.0-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index 3bfcbeb..040525c 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,6 @@ set -eo pipefail declare -A php_version=( - [2022.10]='7.4' [default]='8.0' )