* PHP - imagick & mcrypt fix.

Author: StaffNowa

.env.dist

@@ -44,7 +44,7 @@ USER_CONFIG_PATH=./user
 # Debian OS available versions: jessie, stretch, buster, bullseye
 DEBIAN_VERSION=bullseye
 
-# PHP available versions: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.1
+# PHP available versions: 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1
 PHP_VERSION=8.1
 
 # Nginx settings

commands/start.go

@@ -198,14 +198,18 @@ func doNginxBuild() {
 func doPhpBuild() {
 	util.Copy("config/php/Dockerfile.build", "config/php/Dockerfile")
 
-	packageList := []string{"symfony-cli", "gnupg1", "openssl", "git", "unzip", "libzip-dev", "nano", "libpng-dev", "libmagickwand-dev", "curl", "openssh-client", "less", "inkscape", "cron", "exiftool", "libicu-dev", "libmcrypt-dev", "libc-client-dev", "libkrb5-dev", "libssl-dev", "libxslt1-dev", "bash-completion"}
+	packageList := []string{"gnupg1", "openssl", "git", "unzip", "libzip-dev", "nano", "libpng-dev", "libmagickwand-dev", "curl", "openssh-client", "less", "inkscape", "cron", "exiftool", "libicu-dev", "libmcrypt-dev", "libc-client-dev", "libkrb5-dev", "libssl-dev", "libxslt1-dev", "bash-completion"}
 	peclInstall := []string{}
 	phpExtInstall := []string{"pdo", "pdo_mysql", "opcache", "zip", "gd", "mysqli", "exif", "bcmath", "calendar", "intl", "soap", "imap", "sockets", "xsl"}
 	phpExtEnable := []string{"mysqli", "calendar", "exif", "bcmath"}
 	npmInstallGlobal := []string{}
 
-	if os.Getenv("PHP_VERSION") != "8.0" && os.Getenv("PHP_VERSION") != "8.1" {
-		phpExtInstall = append(phpExtInstall, "imagick")
+	if os.Getenv("PHP_VERSION") != "5.6" && os.Getenv("PHP_VERSION") != "7.0" && os.Getenv("PHP_VERSION") != "7.1" {
+		packageList = append(packageList, "symfony-cli")
+	}
+
+	if os.Getenv("PHP_VERSION") != "8.2" {
+		peclInstall = append(peclInstall, "imagick")
 		phpExtEnable = append(phpExtEnable, "imagick")
 		util.Sed("__IMAGICK__", "", "config/php/Dockerfile")
 	}
@@ -219,11 +223,16 @@ func doPhpBuild() {
 		phpExtEnable = append(phpExtEnable, "apcu")
 	}
 
-	if os.Getenv("PHP_VERSION") == "5.6" || os.Getenv("PHP_VERSION") == "7.0" || os.Getenv("PHP_VERSION") == "7.1" || os.Getenv("PHP_VERSION") == "7.2" || os.Getenv("PHP_VERSION") == "7.3" || os.Getenv("PHP_VERSION") == "7.4" {
+	if os.Getenv("PHP_VERSION") == "5.6" || os.Getenv("PHP_VERSION") == "7.0" || os.Getenv("PHP_VERSION") == "7.1" {
 		phpExtInstall = append(phpExtInstall, "mcrypt")
 		phpExtEnable = append(phpExtEnable, "mcrypt")
 	}
 
+	if os.Getenv("PHP_VERSION") == "7.2" || os.Getenv("PHP_VERSION") == "7.3" || os.Getenv("PHP_VERSION") == "7.4" || os.Getenv("PHP_VERSION") == "8.0" || os.Getenv("PHP_VERSION") == "8.1" {
+		peclInstall = append(peclInstall, "mcrypt")
+		phpExtEnable = append(phpExtEnable, "mcrypt")
+	}
+
 	if os.Getenv("PHP_VERSION") == "7.4" {
 		util.Sed("docker-php-ext-configure zip --with-libzip && ", "", "config/php/Dockerfile")
 		util.Sed("docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && ", "docker-php-ext-configure gd --with-freetype --with-jpeg && ", "config/php/Dockerfile")
@@ -333,6 +342,12 @@ func doPhpBuild() {
 	util.Sed("__NPM_INSTALL_GLOBAL__", strings.Join(npmInstallGlobal, " "), "config/php/Dockerfile")
 	util.Sed("__CLEANUP__", "&& apt-get clean && rm -rf /var/lib/apt/lists/*", "config/php/Dockerfile")
 
+	if os.Getenv("PHP_VERSION") != "5.6" && os.Getenv("PHP_VERSION") != "7.0" && os.Getenv("PHP_VERSION") != "7.1" {
+		util.Sed("__SYMFONY_CLI__", "echo \"deb [trusted=yes] https://repo.symfony.com/apt/ /\" | tee /etc/apt/sources.list.d/symfony-cli.list && \\", "config/php/Dockerfile")
+	} else {
+		util.Sed("__SYMFONY_CLI__", "\\", "config/php/Dockerfile")
+	}
+
 	util.Sed("    \n", "", "config/php/Dockerfile")
 }
 

config/php/Dockerfile.build

@@ -25,7 +25,7 @@ ARG WKHTMLTOPDF_VERSION
 
 MAINTAINER Vasilij Dusko <[email protected]>
 
-RUN echo "deb [trusted=yes] https://repo.symfony.com/apt/ /" | tee /etc/apt/sources.list.d/symfony-cli.list && \
+RUN __SYMFONY_CLI__
     apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \
     __PACKAGE_LIST__ \