travis testing updates (openemr#3688)

* trying to get php8 travis tests working * some more mariadb 10.5 auto-testing work * docker php 8 fixes * fix * fix
DiscoverAndChange · Jun 29, 2020 · acfb017 · acfb017
1 parent a185e47
commit acfb017
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -96,7 +96,12 @@ language: php
  echo "------------------"
  echo "Main OpenEMR Build"
  echo "------------------"
- composer install || failTest=true
+ if [ "$SKIP_COMPOSER_PLATFORM_REQS" = true ]; then
+ echo "(For PHP8 build to work, using --ignore-platform-reqs parameter for composer install; this is temporary)"
+ composer install --ignore-platform-reqs || failTest=true
+ else
+ composer install || failTest=true
+ fi
  npm install || failTest=true
  npm run build || failTest=true
  composer global require phing/phing || failTest=true
@@ -556,7 +561,7 @@ jobs:
  - *job_summary_prep
  - echo -e "${jobSummary}"
  - if $failJob; then travis_terminate 1; fi
- - name: 'Build and test - PHP 7.2 - Nginx - MariaDB 10.4'
+ - name: 'Build and test - PHP 7.2 - Nginx - MariaDB 10.5'
  php: '7.2'
  env:
  - DOCKER_DIR=nginx_72
@@ -579,7 +584,7 @@ jobs:
  - *job_summary_prep
  - echo -e "${jobSummary}"
  - if $failJob; then travis_terminate 1; fi
- - name: 'Build and test - PHP 7.3 - Nginx - MariaDB 10.4'
+ - name: 'Build and test - PHP 7.3 - Nginx - MariaDB 10.5'
  php: '7.3'
  env:
  - DOCKER_DIR=nginx_73
@@ -602,7 +607,7 @@ jobs:
  - *job_summary_prep
  - echo -e "${jobSummary}"
  - if $failJob; then travis_terminate 1; fi
- - name: 'Build and test - PHP 7.4 - Nginx - MariaDB 10.4'
+ - name: 'Build and test - PHP 7.4 - Nginx - MariaDB 10.5'
  php: '7.4'
  env:
  - DOCKER_DIR=nginx_74
@@ -625,12 +630,13 @@ jobs:
  - *job_summary_prep
  - echo -e "${jobSummary}"
  - if $failJob; then travis_terminate 1; fi
- - name: 'Build and test - PHP 8.0 - Nginx - MariaDB 10.4'
+ - name: 'Build and test - PHP 8.0 - Nginx - MariaDB 10.5'
  php: 'nightly'
  env:
  - DOCKER_DIR=nginx_80
  - OPENEMR_DIR=/usr/share/nginx/html/openemr
  - CHROMIUM_INSTALL="apt-get update; apt-get install -y zip libnss3 chromium"
+ - SKIP_COMPOSER_PLATFORM_REQS=true
  script:
  - failJob=false
  - *dockers_env_start
@@ -649,4 +655,4 @@ jobs:
  - echo -e "${jobSummary}"
  - if $failJob; then travis_terminate 1; fi
  allow_failures:
- - name: 'Build and test - PHP 8.0 - Nginx - MariaDB 10.4'
+ - name: 'Build and test - PHP 8.0 - Nginx - MariaDB 10.5'
diff --git a/ci/nginx_72/docker-compose.yml b/ci/nginx_72/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.4
- command: ['mysqld','--character-set-server=utf8']
+ image: mariadb:10.5
+ command: ['mysqld','--character-set-server=utf8', '--collation-server=utf8_general_ci']
  environment:
  MYSQL_ROOT_PASSWORD: root
  openemr:

diff --git a/ci/nginx_73/docker-compose.yml b/ci/nginx_73/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.4
- command: ['mysqld','--character-set-server=utf8']
+ image: mariadb:10.5
+ command: ['mysqld','--character-set-server=utf8', '--collation-server=utf8_general_ci']
  environment:
  MYSQL_ROOT_PASSWORD: root
  openemr:

diff --git a/ci/nginx_74/docker-compose.yml b/ci/nginx_74/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.4
- command: ['mysqld','--character-set-server=utf8']
+ image: mariadb:10.5
+ command: ['mysqld','--character-set-server=utf8', '--collation-server=utf8_general_ci']
  environment:
  MYSQL_ROOT_PASSWORD: root
  openemr:

diff --git a/ci/nginx_80/docker-compose.yml b/ci/nginx_80/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.1'
 services:
  mysql:
  restart: always
- image: mariadb:10.4
- command: ['mysqld','--character-set-server=utf8']
+ image: mariadb:10.5
+ command: ['mysqld','--character-set-server=utf8', '--collation-server=utf8_general_ci']
  environment:
  MYSQL_ROOT_PASSWORD: root
  openemr:

diff --git a/contrib/util/docker/dockers/dev-php-fpm-8-0-redis/Dockerfile b/contrib/util/docker/dockers/dev-php-fpm-8-0-redis/Dockerfile
@@ -9,7 +9,7 @@
 # php-fpm Dockerfile build for openemr development docker environment
 # This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
 #
-FROM php:rc
+FROM devilbox/php-fpm-8.0
 
 # Update
 RUN apt-get update
@@ -35,8 +35,8 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
  sockets \
  tokenizer \
  xmlreader \
- calendar \
- redis
+ calendar
+ # redis IS NOT YET WORKING I BUILD. KEEP TRYING TO GET THIS TO WORK INTERMITTENTLY
 
 # Copy over the php.ini conf
 COPY php.ini /usr/local/etc/php/php.ini

diff --git a/contrib/util/docker/dockers/dev-php-fpm-8-0/Dockerfile b/contrib/util/docker/dockers/dev-php-fpm-8-0/Dockerfile
@@ -9,7 +9,7 @@
 # php-fpm Dockerfile build for openemr development docker environment
 # This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
 #
-FROM php:rc
+FROM devilbox/php-fpm-8.0
 
 # Update
 RUN apt-get update