From c860f2c47fe1848075c44cf12724c1f2ff95bd3a Mon Sep 17 00:00:00 2001
From: Volodymyr Kolesnykov <volodymyr@wildwolf.name>
Date: Sat, 22 Jun 2024 06:56:26 +0300
Subject: [PATCH 1/4] ci: fix scenario testing

---
 .github/workflows/test-features.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
index 2c2570e3..882dc26d 100644
--- a/.github/workflows/test-features.yml
+++ b/.github/workflows/test-features.yml
@@ -113,9 +113,9 @@ jobs:
       - name: Run tests
         run: |
           if [ -z "${{ matrix.test.filter }}" ]; then
-            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.name }}"
+            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.feature }}"
           else
-            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.name }}" --filter "${{ matrix.test.filter }}"
+            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.feature }}" --filter "${{ matrix.test.filter }}"
           fi
 
   global:

From be87a9897998755d79a52b0de46548b71271ede9 Mon Sep 17 00:00:00 2001
From: Volodymyr Kolesnykov <volodymyr@wildwolf.name>
Date: Sat, 22 Jun 2024 07:12:18 +0300
Subject: [PATCH 2/4] test(mariadb): fix *-root-persist tests

---
 features/test/mariadb/scenarios.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/features/test/mariadb/scenarios.json b/features/test/mariadb/scenarios.json
index e21530e4..d4639fbe 100644
--- a/features/test/mariadb/scenarios.json
+++ b/features/test/mariadb/scenarios.json
@@ -25,6 +25,7 @@
     },
     "ubuntu-root-persist": {
         "image": "ghcr.io/automattic/vip-codespaces/ubuntu-base:latest",
+        "remoteUser": "root",
         "overrideCommand": false,
         "features": {
             "mariadb": {
@@ -59,6 +60,7 @@
     },
     "alpine-root-persist": {
         "image": "ghcr.io/automattic/vip-codespaces/alpine-base:latest",
+        "remoteUser": "root",
         "overrideCommand": false,
         "features": {
             "mariadb": {

From 9e1665e41d48e9c2fdb67925115748b9fc578bec Mon Sep 17 00:00:00 2001
From: Volodymyr Kolesnykov <volodymyr@wildwolf.name>
Date: Sat, 22 Jun 2024 07:22:52 +0300
Subject: [PATCH 3/4] fix(phpmyadmin): do not set restrictive permissions for
 `phpmyadmin-password`

Because the build-time user ID may differ from the run-time user ID,
it is dangerous to set the 0600 permissions on `/etc/conf.d/phpmyadmin-password`,
as this may render the file unreadable.
---
 features/src/phpmyadmin/devcontainer-feature.json | 2 +-
 features/src/phpmyadmin/install.sh                | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/features/src/phpmyadmin/devcontainer-feature.json b/features/src/phpmyadmin/devcontainer-feature.json
index 2aa586e3..02c5572a 100644
--- a/features/src/phpmyadmin/devcontainer-feature.json
+++ b/features/src/phpmyadmin/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "id": "phpmyadmin",
     "name": "phpMyAdmin",
-    "version": "1.1.9",
+    "version": "1.1.10",
     "description": "Installs phpMyAdmin into the Dev Environment",
     "options": {
         "enabled": {
diff --git a/features/src/phpmyadmin/install.sh b/features/src/phpmyadmin/install.sh
index 6dbed1c6..b6798f84 100755
--- a/features/src/phpmyadmin/install.sh
+++ b/features/src/phpmyadmin/install.sh
@@ -73,8 +73,6 @@ if [ "${ENABLED}" = "true" ]; then
     curl -SL https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz | tar --strip-components=1 -zxm -f - -C /usr/share/webapps/phpmyadmin
 
     LC_ALL=C < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c24 > /etc/conf.d/phpmyadmin-password
-    chown "${_REMOTE_USER}:${_REMOTE_USER}" /etc/conf.d/phpmyadmin-password
-    chmod 0600 /etc/conf.d/phpmyadmin-password
     if [ -d /etc/nginx/conf.extra ]; then
         htpasswd -nim vipgo < /etc/conf.d/phpmyadmin-password > /etc/nginx/conf.extra/.htpasswd-pma
         chown "${NGINX_USER}:${NGINX_USER}" /etc/nginx/conf.extra/.htpasswd-pma

From c5f92d505c4ad45156089c6170db9e3cc1f92ced Mon Sep 17 00:00:00 2001
From: Volodymyr Kolesnykov <volodymyr@wildwolf.name>
Date: Sat, 22 Jun 2024 07:25:52 +0300
Subject: [PATCH 4/4] ci: split tests for elasticsearch because of disk space
 issues

---
 .github/workflows/test-features.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
index 882dc26d..f3145d46 100644
--- a/.github/workflows/test-features.yml
+++ b/.github/workflows/test-features.yml
@@ -68,6 +68,13 @@ jobs:
           - feature: cron
           - feature: cron-control-runner
           - feature: elasticsearch
+            filter: alpine-base-persist
+          - feature: elasticsearch
+            filter: alpine-base-nopersist
+          - feature: elasticsearch
+            filter: ubuntu-base-persist
+          - feature: elasticsearch
+            filter: ubuntu-base-nopersist
           - feature: mailpit
           - feature: memcached
           - feature: mariadb