migrate ci and dev dockers to mariadb 10.11 long term release (openem…

…r#6264)
DiscoverAndChange · Mar 6, 2023 · 91a2c16 · 91a2c16
1 parent e9b9f17
commit 91a2c16
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 43 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,11 +11,11 @@ permissions:
 
 jobs:
 
- build_apache_80_106:
- name: PHP 8.0 - Apache - MariaDB 10.6
+ build_apache_80_1011:
+ name: PHP 8.0 - Apache - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_80_106
+ DOCKER_DIR: apache_80_1011
  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:
@@ -104,11 +104,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_82_106:
- name: PHP 8.2 - Apache - MariaDB 10.6 (skipping unit testing for now, keep retrying in future)
+ build_apache_82_1011:
+ name: PHP 8.2 - Apache - MariaDB 10.11 (skipping unit testing for now, keep retrying in future)
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_82_106
+ DOCKER_DIR: apache_82_1011
  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:
@@ -197,11 +197,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_81_1010:
- name: PHP 8.1 - Apache - MariaDB 10.10 (short term release)
+ build_apache_81_1011:
+ name: PHP 8.1 - Apache - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_81_1010
+ DOCKER_DIR: apache_81_1011
  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:
@@ -290,11 +290,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_81_109:
- name: PHP 8.1 - Apache - MariaDB 10.9 (short term release)
+ build_apache_81_1010:
+ name: PHP 8.1 - Apache - MariaDB 10.10 (short term release)
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_81_109
+ DOCKER_DIR: apache_81_1010
  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:
@@ -383,11 +383,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_81_108:
- name: PHP 8.1 - Apache - MariaDB 10.8 (short term release)
+ build_apache_81_109:
+ name: PHP 8.1 - Apache - MariaDB 10.9 (short term release)
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_81_108
+ DOCKER_DIR: apache_81_109
  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:
@@ -476,11 +476,11 @@ jobs:
  build_test_common
  if: ${{ success() || failure() }}
 
- build_apache_81_107:
- name: PHP 8.1 - Apache - MariaDB 10.7 (short term release)
+ build_apache_81_108:
+ name: PHP 8.1 - Apache - MariaDB 10.8 (short term release)
  runs-on: ubuntu-22.04
  env:
- DOCKER_DIR: apache_81_107
+ DOCKER_DIR: apache_81_108
  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:
@@ -1128,7 +1128,7 @@ jobs:
  if: ${{ success() || failure() }}
 
  build_nginx_8:
- name: PHP 8.0 - Nginx - MariaDB 10.6
+ name: PHP 8.0 - Nginx - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
  DOCKER_DIR: nginx_80
@@ -1221,7 +1221,7 @@ jobs:
  if: ${{ success() || failure() }}
 
  build_nginx_81:
- name: PHP 8.1 - Nginx - MariaDB 10.6
+ name: PHP 8.1 - Nginx - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
  DOCKER_DIR: nginx_81
@@ -1314,7 +1314,7 @@ jobs:
  if: ${{ success() || failure() }}
 
  build_nginx_82:
- name: PHP 8.2 - Nginx - MariaDB 10.6
+ name: PHP 8.2 - Nginx - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
  DOCKER_DIR: nginx_82
@@ -1407,7 +1407,7 @@ jobs:
  if: ${{ success() || failure() }}
 
  build_nginx_83:
- name: PHP 8.3 - Nginx - MariaDB 10.6
+ name: PHP 8.3 - Nginx - MariaDB 10.11
  runs-on: ubuntu-22.04
  env:
  DOCKER_DIR: nginx_83

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -69,7 +69,7 @@ You will need a "local" version of OpenEMR to make changes to the source code. T
 8. To ensure you are using the most recent dockers, recommend running below set of commands intermittently:
  ```console
  docker pull openemr/openemr:flex
- docker pull mariadb:10.6
+ docker pull mariadb:10.11
  docker pull phpmyadmin/phpmyadmin
  docker pull couchdb
  docker pull openemr/dev-ldap:easy

diff --git a/ci/apache_80_106/docker-compose.yml → ci/apache_80_1011/docker-compose.yml b/ci/apache_80_106/docker-compose.yml → ci/apache_80_1011/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/apache_81_107/docker-compose.yml → ci/apache_81_1011/docker-compose.yml b/ci/apache_81_107/docker-compose.yml → ci/apache_81_1011/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.7
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/apache_82_106/docker-compose.yml → ci/apache_82_1011/docker-compose.yml b/ci/apache_82_106/docker-compose.yml → ci/apache_82_1011/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/nginx_80/docker-compose.yml b/ci/nginx_80/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/nginx_81/docker-compose.yml b/ci/nginx_81/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/nginx_82/docker-compose.yml b/ci/nginx_82/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/ci/nginx_83/docker-compose.yml b/ci/nginx_83/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root

diff --git a/docker/development-easy-light/docker-compose.yml b/docker/development-easy-light/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4','--ssl-ca=/etc/ssl/ca.pem','--ssl_cert=/etc/ssl/server-cert.pem','--ssl_key=/etc/ssl/server-key.pem']
  ports:
  - 8320:3306

diff --git a/docker/development-easy/docker-compose.yml b/docker/development-easy/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4','--ssl-ca=/etc/ssl/ca.pem','--ssl_cert=/etc/ssl/server-cert.pem','--ssl_key=/etc/ssl/server-key.pem']
  ports:
  - 8320:3306

diff --git a/docker/development-insane/README.md b/docker/development-insane/README.md
@@ -95,8 +95,8 @@ setup input screen:
  `mariadb-very-very-old` or `mariadb-very-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;
- `mariadb` is version 10.6; `mariadb-ssl` is version 10.6 with support for ssl; `mariadb-old` is version 10.5; `mariadb-very-old` is
- version 10.4; `mariadb-very-very-old` is version 10.3; `mariadb-very-very-very-old` is version 10.2)
+ `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; `mariadb-very-very-very-old` is version 10.3)
  - for `Root Pass`, use `root`
  - for `User Hostname`, use `%`
 
@@ -132,11 +132,11 @@ docker pull openemr/dev-php-fpm:8.0-redis
 docker pull openemr/dev-php-fpm:7.4-redis
 docker pull openemr/dev-php-fpm:7.3-redis
 docker pull openemr/dev-nginx
+docker pull mariadb:10.11
 docker pull mariadb:10.6
 docker pull mariadb:10.5
 docker pull mariadb:10.4
 docker pull mariadb:10.3
-docker pull mariadb:10.2
 docker pull mysql:8
 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
@@ -56,7 +56,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' or `mariadb-very-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.6; mariadb-ssl is version 10.6 with support for ssl; mariadb-old is version 10.5; mariadb-very-old is version 10.4; mariadb-very-very-old is version 10.3; mariadb-very-very-very-old is version 10.2)
+# 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' or `mariadb-very-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; mariadb-very-very-very-old is version 10.3)
 # 2. for Root Pass, use 'root'
 # 3. for User Hostname, use '%'
 # And when need to tear it down and restart it
@@ -249,13 +249,13 @@ services:
  EMPTY: "yes"
  mariadb:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root
  mariadb-ssl:
  restart: always
- image: mariadb:10.6
+ image: mariadb:10.11
  command: ['mysqld','--character-set-server=utf8mb4','--ssl-ca=/etc/ssl/ca.pem','--ssl_cert=/etc/ssl/server-cert.pem','--ssl_key=/etc/ssl/server-key.pem']
  volumes:
  - ../library/sql-ssl-certs-keys/insane/ca.pem:/etc/ssl/ca.pem:ro
@@ -265,27 +265,27 @@ services:
  MYSQL_ROOT_PASSWORD: root
  mariadb-old:
  restart: always
- image: mariadb:10.5
+ image: mariadb:10.6
  command: ['mysqld','--character-set-server=utf8mb4']
  ports:
  - 8210:3306
  environment:
  MYSQL_ROOT_PASSWORD: root
  mariadb-very-old:
  restart: always
- image: mariadb:10.4
+ image: mariadb:10.5
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root
- mariadb--very-very-old:
+ mariadb-very-very-old:
  restart: always
- image: mariadb:10.3
+ image: mariadb:10.4
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root
  mariadb-very-very-very-old:
  restart: always
- image: mariadb:10.2
+ image: mariadb:10.3
  command: ['mysqld','--character-set-server=utf8mb4']
  environment:
  MYSQL_ROOT_PASSWORD: root