From 1e0ea74ebbc2c4f4e6e40c9ee1f804ee08c007ab Mon Sep 17 00:00:00 2001 From: Brady Miller Date: Tue, 25 Jun 2024 14:44:01 -0700 Subject: [PATCH] feat: add mysql 8.4 to ci and insane dev environment (#7519) --- .github/workflows/test.yml | 6 +++--- .../docker-compose.yml | 4 ++-- docker/development-insane/README.md | 3 ++- docker/development-insane/docker-compose.yml | 14 ++++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) rename ci/{apache_83_83 => apache_83_84}/docker-compose.yml (75%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3806e6c6094..c5fb8c14d9b 100644 --- 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 b/ci/apache_83_84/docker-compose.yml similarity index 75% rename from ci/apache_83_83/docker-compose.yml rename to ci/apache_83_84/docker-compose.yml index 91e20a8c64f..635d830766a 100644 --- a/ci/apache_83_83/docker-compose.yml +++ b/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 index 63e1ff7a5d0..3d633831975 100644 --- 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 index c11ed09ba70..d389b7aafca 100644 --- 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