feat: add mysql 8.4 to ci and insane dev environment (openemr#7519)

bradymiller · Jun 25, 2024 · 1e0ea74 · 1e0ea74
1 parent 9a57c29
commit 1e0ea74
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -942,11 +942,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_83_83:
-    name: PHP 8.3 - Apache - MySQL 8.3 (short term release)
+  build_apache_83_84:
+    name: PHP 8.3 - Apache - MySQL 8.4
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_83_83
+      DOCKER_DIR: apache_83_84
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:

diff --git a/ci/apache_83_83/docker-compose.yml → ci/apache_83_84/docker-compose.yml b/ci/apache_83_83/docker-compose.yml → ci/apache_83_84/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
   mysql:
     restart: always
-    image: mysql:8.3
-    command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
+    image: mysql:8.4
+    command: ['mysqld','--character-set-server=utf8mb4']
     environment:
       MYSQL_ROOT_PASSWORD: root
   openemr:

diff --git a/docker/development-insane/README.md b/docker/development-insane/README.md
@@ -90,7 +90,7 @@ setup input screen:
  - for `Server Host`, use either `mariadb` or `mariadb-ssl` or `mysql` or `mariadb-old` or `mariadb-very-old` or
    `mariadb-very-very-old` or `mysql-old` (you have all
    mariadb/mysql/mariadb-\*/mysql-\* dockers ready to go to make testing either one easy;
-   `mysql` is version 8.0; `mysql-old` is version 5.7;
+   `mysql` is version 8.4; `mysql-old` is version 8.0; `mysql-old-old` is version 5.7;
    `mariadb` is version 10.11; `mariadb-ssl` is version 10.11 with support for ssl; `mariadb-old` is version 10.6; `mariadb-very-old` is
    version 10.5; `mariadb-very-very-old` is version 10.4)
  - for `Root Pass`, use `root`
@@ -130,6 +130,7 @@ docker pull mariadb:10.11
 docker pull mariadb:10.6
 docker pull mariadb:10.5
 docker pull mariadb:10.4
+docker pull mysql:8.4
 docker pull mysql:8.0
 docker pull mysql:5.7
 docker pull phpmyadmin/phpmyadmin

diff --git a/docker/development-insane/docker-compose.yml b/docker/development-insane/docker-compose.yml
@@ -52,7 +52,7 @@
 
 #
 #    On the main setup input screen:
-#     1. for Server Host, use either 'mariadb' or `mariadb-ssl` or 'mysql' or 'mysql-old' or 'mariadb-old' or 'mariadb-very-old' or 'mariadb-very-very-old' (have both mariadb/mysql/mariadb-dev/mysql dockers ready to go make testing either one easy; mysql is version 8.0; mysql-old is version 5.7; mariadb is version 10.11; mariadb-ssl is version 10.11 with support for ssl; mariadb-old is version 10.6; mariadb-very-old is version 10.5; mariadb-very-very-old is version 10.4)
+#     1. for Server Host, use either 'mariadb' or `mariadb-ssl` or 'mysql' or 'mysql-old' or 'mysql-old-old' or 'mariadb-old' or 'mariadb-very-old' or 'mariadb-very-very-old' (have both mariadb/mysql/mariadb-dev/mysql dockers ready to go make testing either one easy; mysql is version 8.4; mysql-old is version 8.0; mysql-old-old is version 5.7; mariadb is version 10.11; mariadb-ssl is version 10.11 with support for ssl; mariadb-old is version 10.6; mariadb-very-old is version 10.5; mariadb-very-very-old is version 10.4)
 #     2. for Root Pass, use 'root'
 #     3. for User Hostname, use '%'
 #    And when need to tear it down and restart it
@@ -281,13 +281,19 @@ services:
       MYSQL_ROOT_PASSWORD: root
   mysql:
     restart: always
-    image: mysql:8.0
-    command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
+    image: mysql:8.4
+    command: ['mysqld','--character-set-server=utf8mb4']
     ports:
     - 8220:3306
     environment:
       MYSQL_ROOT_PASSWORD: root
   mysql-old:
+    restart: always
+    image: mysql:8.0
+    command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+  mysql-old-old:
     restart: always
     image: mysql:5.7
     command: ['mysqld','--character-set-server=utf8mb4']
@@ -299,7 +305,7 @@ services:
     ports:
     - 8200:80
     environment:
-      PMA_HOSTS: mariadb,mariadb-old,mariadb-very-old,mariadb-very-very-old,mysql,mysql-old,mariadb-ssl
+      PMA_HOSTS: mariadb,mariadb-old,mariadb-very-old,mariadb-very-very-old,mysql,mysql-old,mysql-old-old,mariadb-ssl
   couchdb:
     restart: always
     image: couchdb