From d589e0f0cfce05015c14d0a9441b5310c9a48ae7 Mon Sep 17 00:00:00 2001 From: Dennis Frank Date: Sun, 24 May 2020 03:53:10 +0200 Subject: [PATCH 1/6] Update .gitignore comment --- .gitignore | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 782e34a..1a34aba 100644 --- a/.gitignore +++ b/.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* From 1f6aa3ac7424685c0b3d521a66616cf316725608 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 6 Aug 2020 08:27:29 -0400 Subject: [PATCH 2/6] Make it static --- cms/config/app.web.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/config/app.web.php b/cms/config/app.web.php index 982368a..bf1f73b 100644 --- a/cms/config/app.web.php +++ b/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 From 13eab890e400fae6463bc125ab0dc2b3d4d36fa0 Mon Sep 17 00:00:00 2001 From: Mildly Geeky Date: Mon, 10 Aug 2020 13:05:45 -0400 Subject: [PATCH 3/6] Adds init: true --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index d27089d..c177b0c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: build: context: ./docker-config/nginx dockerfile: ./Dockerfile + init: true env_file: &env - ./cms/.env links: @@ -20,6 +21,7 @@ services: build: context: ./docker-config/php-dev-craft dockerfile: ./Dockerfile + init: true depends_on: - "mariadb" - "redis" @@ -41,6 +43,7 @@ services: build: context: ./docker-config/mariadb dockerfile: ./Dockerfile + init: true env_file: *env environment: @@ -57,6 +60,7 @@ services: build: context: ./docker-config/redis dockerfile: ./Dockerfile + init: true expose: - "6379" # webpack - frontend build system @@ -64,6 +68,7 @@ services: build: context: ./docker-config/node-dev-webpack dockerfile: ./Dockerfile + init: true env_file: *env ports: From 2eeedad7d16f5450b9525723f254e3b183effa40 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 11 Aug 2020 11:32:38 -0400 Subject: [PATCH 4/6] Fix init location Signed-off-by: Andrew Welch --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c177b0c..c08f6c4 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,9 @@ services: build: context: ./docker-config/nginx dockerfile: ./Dockerfile - init: true env_file: &env - ./cms/.env + init: true links: - php ports: @@ -21,7 +21,6 @@ services: build: context: ./docker-config/php-dev-craft dockerfile: ./Dockerfile - init: true depends_on: - "mariadb" - "redis" @@ -29,6 +28,7 @@ services: *env expose: - "9000" + init: true links: - mariadb - redis @@ -43,7 +43,6 @@ services: build: context: ./docker-config/mariadb dockerfile: ./Dockerfile - init: true env_file: *env environment: @@ -51,6 +50,7 @@ services: MYSQL_DATABASE: project MYSQL_USER: project MYSQL_PASSWORD: project + init: true ports: - "3306:3306" volumes: @@ -60,17 +60,17 @@ services: build: context: ./docker-config/redis dockerfile: ./Dockerfile - init: true expose: - "6379" + init: true # webpack - frontend build system webpack: build: context: ./docker-config/node-dev-webpack dockerfile: ./Dockerfile - init: true env_file: *env + init: true ports: - "8080:8080" volumes: From 715c6a9bba86a20ff3453807673195b0941bebf1 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 11 Aug 2020 11:34:45 -0400 Subject: [PATCH 5/6] =?UTF-8?q?Add=20=E2=80=94no-tablespaces?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/common/common_mysql.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/common/common_mysql.sh b/scripts/common/common_mysql.sh index f89d995..2edc714 100644 --- a/scripts/common/common_mysql.sh +++ b/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 " From 55bb4ec9ce408fbeeb530811cceacd82c670e074 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 11 Aug 2020 11:38:21 -0400 Subject: [PATCH 6/6] Version 2.3.1 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d2c03..7067cb1 100644 --- a/CHANGELOG.md +++ b/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()`