Merge branch 'release/2.4.6' into craft-webpack

nystudio107 · Nov 25, 2020 · 90ad767 · 90ad767
2 parents d0455b9 + ca531a6
commit 90ad767
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.6 - 2020.11.25
+### Changed
+* Change `mysql-client` to `mariadb-client`
+
 ## 2.4.5 - 2020.11.25
 ### Added
 * Add `mysql-client` in the `php-dev-craft` & `php-prod-craft` MariaDB containers so we get `mysqldump`

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "keywords": [
     "craft",
     "cms",

diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
     && \
     # apt Debian packages
     apt-get install -y \
-        mysql-client \
+        mariadb-client \
         nano \
         jpegoptim \
         optipng \

diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update \
     && \
     # apt Debian packages
     apt-get install -y \
-        mysql-client \
+        mariadb-client \
         nano \
         jpegoptim \
         optipng \