MySQL = enable /disable

Author: StaffNowa

.env.dist

@@ -162,6 +162,7 @@ ELK=no
 SF_CLI=no
 DOCKER_ENV_PHP=no
 PHP_IMAGICK=no
+MYSQL=yes
 
 # Enable ionCube
 # ionCube is a PHP module extension that loads encrypted PHP files and speeds up webpages.

commands/start.go

@@ -452,17 +452,23 @@ func doBuildMySQLConf() {
 
 func doBuild() {
 	util.Copy("docker/compose.yml", "docker-compose.yml")
+	util.AppendFile("docker-compose.yml", util.FileGetContents("docker/php.yml"))
 
 	if os.Getenv("DOCKER_ENV_PHP") == "yes" {
 		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/env/php.yml"))
 	}
 
-	if os.Getenv("MYSQL_INST") == "mysql" {
-		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mysql.yml"))
-	} else {
-		if os.Getenv("MYSQL_INST") == "mariadb" {
-			util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mariadb.yml"))
+	if os.Getenv("MYSQL") == "yes" {
+		if os.Getenv("MYSQL_INST") == "mysql" {
+			util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mysql.yml"))
+		} else {
+			if os.Getenv("MYSQL_INST") == "mariadb" {
+				util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mariadb.yml"))
+			}
 		}
+		util.Sed("#php_depends_on", "depends_on:\r\n      - mysql", "docker-compose.yml")
+	} else {
+		util.Sed("#php_depends_on", "", "docker-compose.yml")
 	}
 
 	if os.Getenv("MAILHOG") == "yes" {
@@ -473,7 +479,7 @@ func doBuild() {
 		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/mailpit.yml"))
 	}
 
-	if os.Getenv("PMA") == "yes" {
+	if os.Getenv("PMA") == "yes" && os.Getenv("MYSQL") == "yes" {
 		util.AppendFile("docker-compose.yml", util.FileGetContents("docker/phpmyadmin.yml"))
 	}
 

docker/compose.yml

@@ -28,43 +28,3 @@ services:
       - php
     environment:
       - TZ=${DEFAULT_TIMEZONE}
-
-  php:
-    build:
-      context: config/php
-      args:
-        USER_ID: ${USER_ID}
-        GROUP_ID: ${GROUP_ID}
-        PHP_VERSION: ${PHP_VERSION}
-        DEFAULT_TIMEZONE: ${DEFAULT_TIMEZONE}
-        PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT}
-        PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
-        PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME}
-        NODE_JS_VERSION: ${NODE_JS_VERSION}
-        XDEBUG_CLIENT_PORT: ${XDEBUG_CLIENT_PORT}
-        XDEBUG_START_WITH_REQUEST: ${XDEBUG_START_WITH_REQUEST}
-        XDEBUG_REMOTE_HOST: ${XDEBUG_REMOTE_HOST}
-        XDEBUG_REMOTE_CONNECT_BACK: ${XDEBUG_REMOTE_CONNECT_BACK}
-        XDEBUG_FILE_LINK_FORMAT: ${XDEBUG_FILE_LINK_FORMAT}
-        XDEBUG_IDE_KEY: ${XDEBUG_IDE_KEY}
-        COMPOSER_VERSION: ${COMPOSER_VERSION}
-    ports:
-      - ${PORT_PHP}:9000
-      - 8888:8888
-    volumes:
-      - ${PROJECT_PATH}:/var/www/project:cached
-      - ${SF_COMMUNITY_PATH}:/var/www/symfony:cached
-      - ${COMPOSER_PATH}/cache:/var/www/.composer/cache:cached
-      - ${SSH_KEY_PATH}/id_rsa:/var/www/.ssh/id_rsa
-      - ${SSH_KEY_PATH}/id_rsa.pub:/var/www/.ssh/id_rsa.pub
-      - ${SSH_KEY_PATH}/known_hosts:/var/www/.ssh/known_hosts
-      - ${USER_CONFIG_PATH}/.bash_history:/var/www/.bash_history
-      - ${USER_CONFIG_PATH}/.bashrc:/var/www/.bashrc
-      - ${USER_CONFIG_PATH}/.gitconfig:/var/www/.gitconfig
-      - ${USER_CONFIG_PATH}/.gitignore:/var/www/.gitignore
-      - ${USER_CONFIG_PATH}/bash_completion/console:/etc/bash_completion.d/console
-      - ./config/php/php-fpm.d/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
-      - ./config/php/php-fpm.d/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf:ro
-      - ./config/supervisor/conf.d/messenger-worker.conf:/etc/supervisor/conf.d/messenger-worker.conf
-    depends_on:
-      - mysql

docker/php.yml

@@ -0,0 +1,39 @@
+
+  php:
+    build:
+        context: config/php
+        args:
+            USER_ID: ${USER_ID}
+            GROUP_ID: ${GROUP_ID}
+            PHP_VERSION: ${PHP_VERSION}
+            DEFAULT_TIMEZONE: ${DEFAULT_TIMEZONE}
+            PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT}
+            PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
+            PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME}
+            NODE_JS_VERSION: ${NODE_JS_VERSION}
+            XDEBUG_CLIENT_PORT: ${XDEBUG_CLIENT_PORT}
+            XDEBUG_START_WITH_REQUEST: ${XDEBUG_START_WITH_REQUEST}
+            XDEBUG_REMOTE_HOST: ${XDEBUG_REMOTE_HOST}
+            XDEBUG_REMOTE_CONNECT_BACK: ${XDEBUG_REMOTE_CONNECT_BACK}
+            XDEBUG_FILE_LINK_FORMAT: ${XDEBUG_FILE_LINK_FORMAT}
+            XDEBUG_IDE_KEY: ${XDEBUG_IDE_KEY}
+            COMPOSER_VERSION: ${COMPOSER_VERSION}
+    ports:
+        - ${PORT_PHP}:9000
+        - 8888:8888
+    volumes:
+        - ${PROJECT_PATH}:/var/www/project:cached
+        - ${SF_COMMUNITY_PATH}:/var/www/symfony:cached
+        - ${COMPOSER_PATH}/cache:/var/www/.composer/cache:cached
+        - ${SSH_KEY_PATH}/id_rsa:/var/www/.ssh/id_rsa
+        - ${SSH_KEY_PATH}/id_rsa.pub:/var/www/.ssh/id_rsa.pub
+        - ${SSH_KEY_PATH}/known_hosts:/var/www/.ssh/known_hosts
+        - ${USER_CONFIG_PATH}/.bash_history:/var/www/.bash_history
+        - ${USER_CONFIG_PATH}/.bashrc:/var/www/.bashrc
+        - ${USER_CONFIG_PATH}/.gitconfig:/var/www/.gitconfig
+        - ${USER_CONFIG_PATH}/.gitignore:/var/www/.gitignore
+        - ${USER_CONFIG_PATH}/bash_completion/console:/etc/bash_completion.d/console
+        - ./config/php/php-fpm.d/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
+        - ./config/php/php-fpm.d/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf:ro
+        - ./config/supervisor/conf.d/messenger-worker.conf:/etc/supervisor/conf.d/messenger-worker.conf
+    #php_depends_on