Merge branch 'release/2.5.8' into craft-vite

CHANGELOG.md

@@ -1,5 +1,13 @@
 # nystudio107/craft Change Log
 
+## 2.5.8 - 2022.04.13
+### Fixed
+* Changed the hostname from `mysql` to `mariadb` in the `composer_install.sh` and `run_queue.sh` scripts, since we're using MariaDB
+
+### Changed
+* Use `"eslint": "^7.0.0"` to avoid package version conflicts with `vite-plugin-eslint`
+* Add correct at-rule-no-unknown config ([#80](https://github.com/nystudio107/craft/pull/80))
+
 ## 2.5.7 - 2022.04.08
 ### Changed
 * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations

buildchain/.stylelintrc.json

@@ -5,11 +5,11 @@
     "stylelint-config-recommended-vue"
   ],
   "rules": {
-    "at-rule-no-unknown": [ true, {
+    "at-rule-no-unknown": null,
+    "scss/at-rule-no-unknown": [ true, {
       "ignoreAtRules": [
-        "apply",
-        "extends",
         "screen",
+        "extends",
         "responsive",
         "tailwind"
       ]

buildchain/package.json

@@ -19,7 +19,7 @@
     "@vitejs/plugin-vue": "^1.2.2",
     "@vue/compiler-sfc": "^3.0.5",
     "autoprefixer": "^10.4.0",
-    "eslint": "^8.0.0",
+    "eslint": "^7.0.0",
     "eslint-plugin-vue": "^8.0.0",
     "postcss": "^8.4.0",
     "rollup-plugin-critical": "^1.0.4",

docker-config/php-prod-craft/composer_install.sh

@@ -19,7 +19,7 @@ if [ ! -f "composer.lock" ] || [ ! -d "vendor" ]; then
     su-exec www-data composer install --verbose --no-progress --no-scripts --optimize-autoloader --no-interaction
     # Wait until the MySQL db container responds
     echo "### Waiting for MySQL database"
-    until eval "mysql -h mysql -u $DB_USER -p$DB_PASSWORD $DB_DATABASE -e 'select 1' > /dev/null 2>&1"
+    until eval "mysql -h mariadb -u $DB_USER -p$DB_PASSWORD $DB_DATABASE -e 'select 1' > /dev/null 2>&1"
     do
       sleep 1
     done

docker-config/php-prod-craft/run_queue.sh

@@ -15,7 +15,7 @@
 cd /var/www/project/cms
 # Wait until the MySQL db container responds
 echo "### Waiting for MySQL database"
-until eval "mysql -h mysql -u $DB_USER -p$DB_PASSWORD $DB_DATABASE -e 'select 1' > /dev/null 2>&1"
+until eval "mysql -h mariadb -u $DB_USER -p$DB_PASSWORD $DB_DATABASE -e 'select 1' > /dev/null 2>&1"
 do
   sleep 1
 done