Merge branch 'release/2.3.1' into craft-webpack

.gitignore

@@ -9,12 +9,7 @@
 # @since     1.0.0
 # @license   MIT
 
-# This file should be renamed to '.gitignore' and placed in your
-# Craft 3 CMS project root directory
-
-
-# This file should be renamed to '.gitignore' and placed in your
-# Craft 3 CMS project root directory
+# This file should be placed in your Craft 3 CMS project root directory
 
 # CRAFT ENVIRONMENT
 .env*

CHANGELOG.md

@@ -1,6 +1,10 @@
 # nystudio107/craft Change Log
 
 ## 2.3.1 - 2020.08.10
+### Added
+* Added `init` to the `docker-compose.yml` to processes are sent signals
+* Added `--no-tablespaces` to the mysqldump command options to work around changes in MySQL
+
 ### Fixed
 * Fix redis session config to use `App::sessionConfig()`
 

cms/config/app.web.php

@@ -19,7 +19,7 @@
 
 return [
     'components' => [
-        'session' => function() {
+        'session' => static function() {
             // Get the default component config
             $config = craft\helpers\App::sessionConfig();
             // Override the class to use Redis' session class and our config settings

docker-compose.yml

@@ -8,6 +8,7 @@ services:
       dockerfile: ./Dockerfile
     env_file: &env
       - ./cms/.env
+    init: true
     links:
       - php
     ports:
@@ -27,6 +28,7 @@ services:
       *env
     expose:
       - "9000"
+    init: true
     links:
       - mariadb
       - redis
@@ -48,6 +50,7 @@ services:
       MYSQL_DATABASE: project
       MYSQL_USER: project
       MYSQL_PASSWORD: project
+    init: true
     ports:
       - "3306:3306"
     volumes:
@@ -59,13 +62,15 @@ services:
       dockerfile: ./Dockerfile
     expose:
       - "6379"
+    init: true
   # webpack - frontend build system
   webpack:
     build:
       context: ./docker-config/node-dev-webpack
       dockerfile: ./Dockerfile
     env_file:
       *env
+    init: true
     ports:
       - "8080:8080"
     volumes:

scripts/common/common_mysql.sh

@@ -21,6 +21,7 @@ done
 # Additional arguments for mysqldump
 MYSQLDUMP_ADDITIONAL_ARGS=""
 MYSQLDUMP_ADDITIONAL_ARGS+="--add-drop-table "
+MYSQLDUMP_ADDITIONAL_ARGS+="--no-tablespaces "
 MYSQLDUMP_ADDITIONAL_ARGS+="--comments "
 MYSQLDUMP_ADDITIONAL_ARGS+="--create-options "
 MYSQLDUMP_ADDITIONAL_ARGS+="--dump-date "