Use Docker consistently

.scrutinizer.yml

@@ -21,7 +21,7 @@ before_commands:
 tools:
  external_code_coverage:
  timeout: 3600
- runs: 30 # 25x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
+ runs: 28 # 23x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
 
 filter:
  excluded_paths:

.travis.yml

@@ -14,7 +14,11 @@ before_install:
  fi
 
 before_script:
- - if [[ "$DB" == "mysql" || "$DB" == "mysqli" || "$DB" == *"mariadb"* ]]; then mysql < tests/travis/create-mysql-schema.sql; fi;
+ - |
+ if [[ -n "$IMAGE" ]]
+ then
+ bash ./tests/travis/docker-run-mysql-or-mariadb.sh
+ fi
 
 install:
  - travis_retry composer -n install --prefer-dist
@@ -53,36 +57,20 @@ jobs:
 
  - stage: Test
  php: 7.2
- env: DB=mysql.docker MYSQL_VERSION=8.0
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ env: DB=mysql.docker IMAGE=mysql:8.0
  - stage: Test
  php: 7.2
- env: DB=mysqli.docker MYSQL_VERSION=8.0
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ env: DB=mysqli.docker IMAGE=mysql:8.0
  - stage: Test
  php: 7.2
- env: DB=mariadb MARIADB_VERSION=10.3
- addons:
- mariadb: 10.3
+ env: DB=mariadb.docker IMAGE=mariadb:10.3
  - stage: Test
  php: 7.2
- env: DB=mariadb.mysqli MARIADB_VERSION=10.3
- addons:
- mariadb: 10.3
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
  - stage: Test
  php: 7.2
  env: DB=pgsql POSTGRESQL_VERSION=11.0
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-postgres-11.sh
  - stage: Test
@@ -92,8 +80,6 @@ jobs:
  php: 7.2
  env: DB=sqlsrv
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-sqlsrv.sh
@@ -102,84 +88,62 @@ jobs:
  php: 7.2
  env: DB=pdo_sqlsrv
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
  - bash ./tests/travis/install-mssql.sh
  - stage: Test
  php: 7.3
- env: DB=mysql COVERAGE=yes
- services:
- - mysql
+ env: DB=mysql.docker IMAGE=mysql:5.7 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes
- sudo: required
- before_script:
- - bash ./tests/travis/install-mysql-5.7.sh
+ env: DB=mysql.docker IMAGE=mysql:8.0 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mysql.docker MYSQL_VERSION=8.0 COVERAGE=yes
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ env: DB=mysqli.docker IMAGE=mysql:5.7 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mysqli COVERAGE=yes
- services:
- - mysql
+ env: DB=mysqli.docker IMAGE=mysql:8.0 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes
- sudo: required
- before_script:
- - bash ./tests/travis/install-mysql-5.7.sh
+ env: DB=mariadb.docker IMAGE=mariadb:10.0 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mysqli.docker MYSQL_VERSION=8.0 COVERAGE=yes
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ env: DB=mariadb.docker IMAGE=mariadb:10.1 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mariadb.docker MARIADB_VERSION=10.1 COVERAGE=yes
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mariadb.sh
+ env: DB=mariadb.docker IMAGE=mariadb:10.2 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mariadb MARIADB_VERSION=10.2 COVERAGE=yes
- addons:
- mariadb: 10.2
+ env: DB=mariadb.docker IMAGE=mariadb:10.3 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mariadb MARIADB_VERSION=10.3 COVERAGE=yes
- addons:
- mariadb: 10.3
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.0 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.1 COVERAGE=yes
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mariadb.sh
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.1 COVERAGE=yes
+ - stage: Test
+ php: 7.3
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.2 COVERAGE=yes
  - stage: Test
  php: 7.3
- env: DB=mariadb.mysqli MARIADB_VERSION=10.2 COVERAGE=yes
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3 COVERAGE=yes
+ - stage: Test
+ dist: trusty
+ php: 7.3
+ env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
+ services:
+ - postgresql
  addons:
- mariadb: 10.2
+ postgresql: "9.2"
  - stage: Test
+ dist: trusty
  php: 7.3
- env: DB=mariadb.mysqli MARIADB_VERSION=10.3 COVERAGE=yes
+ env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes
+ services:
+ - postgresql
  addons:
- mariadb: 10.3
+ postgresql: "9.3"
  - stage: Test
  php: 7.3
  env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
@@ -207,16 +171,12 @@ jobs:
  php: 7.3
  env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-postgres-11.sh
  - stage: Test
  php: 7.3
  env: DB=sqlsrv COVERAGE=yes
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-sqlsrv.sh
@@ -225,8 +185,6 @@ jobs:
  php: 7.3
  env: DB=pdo_sqlsrv COVERAGE=yes
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
@@ -235,8 +193,6 @@ jobs:
  php: 7.3
  env: DB=ibm_db2 COVERAGE=yes
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-db2.sh
  - bash ./tests/travis/install-db2-ibm_db2.sh
@@ -246,58 +202,38 @@ jobs:
  install:
  - travis_retry composer update --prefer-dist --prefer-lowest
  - stage: Test
- php: 7.4snapshot
- env: DB=mysql.docker MYSQL_VERSION=8.0
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ php: 7.4
+ env: DB=mysql.docker IMAGE=mysql:8.0
  - stage: Test
- php: 7.4snapshot
- env: DB=mysqli.docker MYSQL_VERSION=8.0
- sudo: required
- services:
- - docker
- before_script:
- - bash ./tests/travis/install-mysql-8.0.sh
+ php: 7.4
+ env: DB=mysqli.docker IMAGE=mysql:8.0
  - stage: Test
- php: 7.4snapshot
- env: DB=mariadb MARIADB_VERSION=10.3
- addons:
- mariadb: 10.3
+ php: 7.4
+ env: DB=mariadb.docker IMAGE=mariadb:10.3
  - stage: Test
- php: 7.4snapshot
- env: DB=mariadb.mysqli MARIADB_VERSION=10.3
- addons:
- mariadb: 10.3
+ php: 7.4
+ env: DB=mariadb.mysqli.docker IMAGE=mariadb:10.3
  - stage: Test
- php: 7.4snapshot
+ php: 7.4
  env: DB=pgsql POSTGRESQL_VERSION=11.0
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-postgres-11.sh
  - stage: Test
- php: 7.4snapshot
+ php: 7.4
  env: DB=sqlite
  - stage: Test
- php: 7.4snapshot
+ php: 7.4
  env: DB=sqlsrv
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-sqlsrv.sh
  - bash ./tests/travis/install-mssql.sh
  - stage: Test
- php: 7.4snapshot
+ php: 7.4
  env: DB=pdo_sqlsrv
  sudo: required
- services:
- - docker
  before_script:
  - bash ./tests/travis/install-sqlsrv-dependencies.sh
  - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh

tests/travis/docker-run-mysql-or-mariadb.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+set -ex
+
+echo "Starting RDBMS…">&2
+
+if [[ "$IMAGE" == "mysql:8.0" ]]
+then
+ CMD_OPTIONS="--default-authentication-plugin=mysql_native_password"
+else
+ CMD_OPTIONS=""
+fi
+
+docker run \
+ --health-cmd='mysqladmin ping --silent' \
+ --detach \
+ --env MYSQL_ALLOW_EMPTY_PASSWORD=yes \
+ --env MYSQL_DATABASE=doctrine_tests \
+ --publish 33306:3306 \
+ --name rdbms \
+ "$IMAGE" $CMD_OPTIONS
+
+while true; do
+ healthStatus=$(docker inspect --format "{{json .State.Health.Status }}" rdbms)
+ case $healthStatus in
+ '"starting"')
+ echo "Waiting for RDBMS to become ready…">&2
+ sleep 1
+ ;;
+ '"healthy"')
+ echo "Container is healthy">&2
+ break
+ ;;
+ '"unhealthy"')
+ echo "Container is unhealthy">&2
+ exit 1
+ ;;
+ *)
+ echo "Unexpected health status $healthStatus">&2
+ ;;
+ esac
+done