From 8c3a2d9049b4fc1a914673c22bdef3741b8bea7e Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Mon, 25 May 2020 12:28:40 +0200 Subject: [PATCH] travis: update image versions (#1103) * travis: update image versions * travis: use mysql client inside the docker container for polling * travis: force mysql client to connect via tcp * travis: use root pass in mysql client * travis: use empty root password --- .travis.yml | 18 +++++++++--------- .travis/wait_mysql.sh | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5639e4fd2..21638db0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ jobs: include: - env: DB=MYSQL8 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -34,7 +34,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mysql:8.0 - - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret + - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -46,7 +46,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MYSQL57 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -54,7 +54,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mysql:5.7 - - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret + - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -66,7 +66,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MARIA55 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -74,7 +74,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mariadb:5.5 - - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret + - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -86,7 +86,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MARIA10_1 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -94,7 +94,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mariadb:10.1 - - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret + - docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -106,7 +106,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - os: osx - osx_image: xcode10.1 + osx_image: xcode11.4 addons: homebrew: packages: diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index e87993e57..fa2054ff1 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -1,7 +1,13 @@ #!/bin/sh + +# use the mysql client inside the docker container if docker is running +[ "$(docker inspect -f '{{.State.Running}}' mysqld 2>/dev/null)" = "true" ] && mysql() { + docker exec mysqld mysql "${@}" +} + while : do - if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then + if mysql --protocol=tcp -e 'select version()'; then break fi sleep 3