From 13b9bf453a1a20de34d51fa0107fddb8eb44f9e9 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michael@dadamotion.be>
Date: Mon, 11 Apr 2022 20:48:49 +0200
Subject: [PATCH 1/4] Add correct `at-rule-no-unknown` config

---
 buildchain/.stylelintrc.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildchain/.stylelintrc.json b/buildchain/.stylelintrc.json
index a6f5243..3784d09 100644
--- a/buildchain/.stylelintrc.json
+++ b/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"
       ]

From 68864aa1bae2a6764ea67911dca6077d5cef42fe Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@keluli.local>
Date: Wed, 13 Apr 2022 18:28:34 -0400
Subject: [PATCH 2/4] refactor: Use `"eslint": "^7.0.0"` to avoid package
 version conflicts with `vite-plugin-eslint`

---
 buildchain/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildchain/package.json b/buildchain/package.json
index bdaa8d2..d051555 100644
--- a/buildchain/package.json
+++ b/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",

From d6e3e58f27e5079eff7291f5f01d4ad02859ce69 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@keluli.local>
Date: Wed, 13 Apr 2022 18:28:53 -0400
Subject: [PATCH 3/4] refactor: Changed the hostname from `mysql` to `mariadb`
 in the `composer_install.sh` and `run_queue.sh` scripts, since we're using
 MariaDB

---
 docker-config/php-prod-craft/composer_install.sh | 2 +-
 docker-config/php-prod-craft/run_queue.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-config/php-prod-craft/composer_install.sh b/docker-config/php-prod-craft/composer_install.sh
index 8215098..0d6045c 100755
--- a/docker-config/php-prod-craft/composer_install.sh
+++ b/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
diff --git a/docker-config/php-prod-craft/run_queue.sh b/docker-config/php-prod-craft/run_queue.sh
index e75ddae..57eebf3 100755
--- a/docker-config/php-prod-craft/run_queue.sh
+++ b/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

From 700695c6f46fff02cc386176e2422e0d21183a2d Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@keluli.local>
Date: Wed, 13 Apr 2022 18:29:16 -0400
Subject: [PATCH 4/4] chore: Version 2.5.8

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3160c1..264f1c2 100644
--- a/CHANGELOG.md
+++ b/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