Retain old format of mariadb config

migrations/container/20181225063950_service-command_change_global_service_container_names.php

@@ -38,9 +38,9 @@ public function up() {
 		 * Sites wp-config changes for global-cache.
 		 */
 		$cache_sites = EE::db()
-			->table( 'sites' )
-			->where( [ [ 'site_type', '==', 'wp' ], [ 'cache_host', '==', 'global-redis' ] ] )
-			->all();
+		                 ->table( 'sites' )
+		                 ->where( [ [ 'site_type', '==', 'wp' ], [ 'cache_host', '==', 'global-redis' ] ] )
+		                 ->all();
 
 		foreach ( $cache_sites as $site ) {
 

migrations/container/20201103094726_service-command_configure_my_cnf.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace EE\Migration;
+
+use EE;
+use \Symfony\Component\Filesystem\Filesystem;
+use function EE\Utils\trailingslashit;
+
+class ConfigureMyCNF extends Base {
+
+	/** @var RevertableStepProcessor $rsp Keeps track of migration state. Reverts on error */
+	private static $rsp;
+
+	public function __construct() {
+
+		parent::__construct();
+		if ( $this->is_first_execution ) {
+			$this->skip_this_migration = true;
+		}
+	}
+
+	/**
+	 * Execute global service container name update.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function up() {
+
+		if ( $this->skip_this_migration ) {
+			EE::debug( 'Skipping configure-my-cnf migration as it is not needed.' );
+
+			return;
+		}
+
+		EE::debug( 'Starting configure-my-cnf' );
+
+		$my_cnf = EE_SERVICE_DIR . '/mariadb/conf/my.cnf';
+
+		if ( is_link( $my_cnf ) ) {
+			unlink( trailingslashit( dirname( $my_cnf ) ) . readlink( $my_cnf ) );
+			unlink( $my_cnf );
+
+			EE::exec( 'rm -f ' . EE_SERVICE_DIR . '/mariadb/conf/mariadb.conf.d/*.cnf' );
+
+			$fs = new Filesystem();
+			$fs->copy( SERVICE_TEMPLATE_ROOT . '/my.cnf.mustache', $my_cnf );
+
+			EE::exec( 'cd ' . EE_SERVICE_DIR . ' && docker-compose restart global-db' );
+		}
+	}
+
+	/**
+	 * No need for down.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function down() {
+	}
+}

migrations/container/20201103184813_service-command_remove_sysctl.php

@@ -47,7 +47,7 @@ public function up() {
 			$running_services[ $count ]['name']  = $service;
 			$launch                              = EE::launch( 'docker-compose ps -q global-' . $service );
 			$running_services[ $count ]['state'] = $launch->stdout;
-			$count++;
+			$count ++;
 		}
 
 		\EE\Service\Utils\generate_global_docker_compose_yml( $this->fs );

src/Service_Command.php

@@ -105,7 +105,7 @@ public function refresh( $args, $assoc_args ) {
 			$running_services[ $count ]['name']  = $service;
 			$launch                              = EE::launch( 'docker-compose ps -q global-' . $service );
 			$running_services[ $count ]['state'] = $launch->stdout;
-			$count++;
+			$count ++;
 		}
 
 		\EE\Service\Utils\generate_global_docker_compose_yml( new Symfony\Component\Filesystem\Filesystem() );

src/helper/service-utils.php

@@ -83,6 +83,7 @@ function init_global_container( $service, $container = '' ) {
 			$fs->copy( SERVICE_TEMPLATE_ROOT . '/my.cnf.mustache', $db_conf_file );
 		}
 		\EE_DOCKER::boot_container( $container, \EE_DOCKER::docker_compose_with_custom() . ' up -d ' . $service );
+
 		return true;
 	} else {
 		return false;