chore: bit of mysql cleanup in ci and dev environments (openemr#7010)

bradymiller · Nov 11, 2023 · 33697e0 · 33697e0
1 parent 7f2e57e
commit 33697e0
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -755,11 +755,104 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_apache_82_8:
-    name: PHP 8.2 - Apache - MySQL 8
+  build_apache_82_82:
+    name: PHP 8.2 - Apache - MySQL 8.2 (short term release)
     runs-on: ubuntu-22.04
     env:
-      DOCKER_DIR: apache_82_8
+      DOCKER_DIR: apache_82_82
+      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:
+      - uses: actions/checkout@v3
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
+      - name: Report PHP Version
+        run: php -v
+
+      - name: Install npm package
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+
+      - name: Main build
+        run: |
+          source ci/ciLibrary.source
+          composer_github_auth
+          main_build
+
+      - name: CCDA build
+        run: |
+          source ci/ciLibrary.source
+          ccda_build
+
+      - name: Dockers environment start
+        run: |
+          source ci/ciLibrary.source
+          dockers_env_start
+          sleep 60
+
+      - name: Install and configure
+        run: |
+          source ci/ciLibrary.source
+          install_configure
+
+      - name: Unit testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_unit
+        if: ${{ success() || failure() }}
+
+      - name: E2e testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_e2e
+        if: ${{ success() || failure() }}
+
+      - name: Api testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_api
+        if: ${{ success() || failure() }}
+
+      - name: Fixtures testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_fixtures
+        if: ${{ success() || failure() }}
+
+      - name: Services testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_services
+        if: ${{ success() || failure() }}
+
+      - name: Validators testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_validators
+        if: ${{ success() || failure() }}
+
+      - name: Controllers testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_controllers
+        if: ${{ success() || failure() }}
+
+      - name: Common testing
+        run: |
+          source ci/ciLibrary.source
+          build_test_common
+        if: ${{ success() || failure() }}
+
+  build_apache_82_80:
+    name: PHP 8.2 - Apache - MySQL 8.0
+    runs-on: ubuntu-22.04
+    env:
+      DOCKER_DIR: apache_82_80
       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_82_8/docker-compose.yml → ci/apache_82_80/docker-compose.yml b/ci/apache_82_8/docker-compose.yml → ci/apache_82_80/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
   mysql:
     restart: always
-    image: mysql:8
+    image: mysql:8.0
     command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
     environment:
       MYSQL_ROOT_PASSWORD: root

diff --git a/ci/apache_82_82/docker-compose.yml b/ci/apache_82_82/docker-compose.yml
@@ -0,0 +1,22 @@
+# docker-compose.yml for travis ci testing
+version: '3.1'
+services:
+  mysql:
+    restart: always
+    image: mysql:8.2
+    command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+  openemr:
+    restart: always
+    image: openemr/openemr:flex-3.18
+    ports:
+    - 80:80
+    - 443:443
+    volumes:
+    - ../../:/var/www/localhost/htdocs/openemr
+    environment:
+      FORCE_NO_BUILD_MODE: "yes"
+      EMPTY: "yes"
+    depends_on:
+    - mysql
diff --git a/docker/development-insane/README.md b/docker/development-insane/README.md
@@ -142,7 +142,7 @@ docker pull mariadb:10.6
 docker pull mariadb:10.5
 docker pull mariadb:10.4
 docker pull mariadb:10.3
-docker pull mysql:8
+docker pull mysql:8.0
 docker pull mysql:5.7
 docker pull phpmyadmin/phpmyadmin
 docker pull couchdb

diff --git a/docker/development-insane/docker-compose.yml b/docker/development-insane/docker-compose.yml
@@ -326,7 +326,7 @@ services:
       MYSQL_ROOT_PASSWORD: root
   mysql:
     restart: always
-    image: mysql:8
+    image: mysql:8.0
     command: ['mysqld','--character-set-server=utf8mb4','--default-authentication-plugin=mysql_native_password']
     ports:
     - 8220:3306