Merge branch 'master' into feature/mysql-configuration

# Conflicts:
#	.env.dist

Author: StaffNowa

.env.dist

@@ -157,13 +157,15 @@ RABBITMQ=no
 SUPERVISOR=no
 ELASTICSEARCH=no
 NGROK=no
+MYSQL=yes
 MONGODB=no
 BLACKFIRE=no
 ELK=no
 SF_CLI=no
 DOCKER_ENV_PHP=no
 PHP_IMAGICK=no
-MYSQL=yes
+PHP_GD=no
+PHP_IMAP=no
 
 # Enable ionCube
 # ionCube is a PHP module extension that loads encrypted PHP files and speeds up webpages.

commands/start.go

@@ -204,14 +204,30 @@ func doPhpBuild() {
 
 	packageList := []string{"gnupg2", "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"}
+	phpExtInstall := []string{"pdo", "pdo_mysql", "opcache", "zip", "mysqli", "exif", "bcmath", "calendar", "intl", "soap", "sockets", "xsl"}
 	phpExtEnable := []string{"mysqli", "calendar", "exif", "bcmath"}
 	npmInstallGlobal := []string{}
 
 	if os.Getenv("SF_CLI") == "yes" {
 		packageList = append(packageList, "symfony-cli")
 	}
 
+	if os.Getenv("PHP_GD") == "yes" {
+		phpExtInstall = append(phpExtInstall, "gd")
+
+		util.Sed("__PHP_GD__", "&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/", "config/php/Dockerfile")
+	} else {
+		util.Sed("__PHP_GD__", "", "config/php/Dockerfile")
+	}
+
+	if os.Getenv("PHP_IMAP") == "yes" {
+		phpExtInstall = append(phpExtInstall, "imap")
+
+		util.Sed("__PHP_IMAP__", "&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl", "config/php/Dockerfile")
+	} else {
+		util.Sed("__PHP_IMAP__", "", "config/php/Dockerfile")
+	}
+
 	if os.Getenv("PHP_VERSION") != "8.2" {
 		if os.Getenv("PHP_IMAGICK") == "yes" {
 			peclInstall = append(peclInstall, "imagick")

config/php/Dockerfile.build

@@ -32,7 +32,7 @@ RUN __SYMFONY_CLI__
     __CLEANUP__
 
 # Install PHP extensions. Type docker-php-ext-install to see available extensions
-RUN docker-php-ext-configure zip --with-libzip && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && docker-php-ext-configure intl && docker-php-ext-configure imap --with-kerberos --with-imap-ssl && docker-php-ext-install -j$(nproc) __PHP_EXT_INSTALL__ \
+RUN docker-php-ext-configure zip --with-libzip __PHP_GD__ && docker-php-ext-configure intl __PHP_IMAP__ && docker-php-ext-install -j$(nproc) __PHP_EXT_INSTALL__ \
     && pecl install __PECL_INSTALL__ && docker-php-ext-enable __PHP_EXT_ENABLE__ \
     && ln -snf /usr/share/zoneinfo/${DEFAULT_TIMEZONE} /etc/localtime && echo ${DEFAULT_TIMEZONE} > /etc/timezone \
     && printf '[PHP]\ndate.timezone = "%s"\n' ${DEFAULT_TIMEZONE} > $PHP_INI_DIR/conf.d/tzone.ini \