Skip to content

Commit 29c7ba6

Browse files
authored
Merge pull request #3465 from morozov/mysql-57-docker
Replaced MySQL 5.7 installed from a PPA with an official Docker image
2 parents 8326b11 + c7450d2 commit 29c7ba6

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
env: DB=mysql COVERAGE=yes
6666
- stage: Test
6767
php: 7.2
68-
env: DB=mysql MYSQL_VERSION=5.7 COVERAGE=yes
68+
env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes
6969
sudo: required
7070
before_script:
7171
- bash ./tests/travis/install-mysql-5.7.sh
@@ -82,7 +82,7 @@ jobs:
8282
env: DB=mysqli COVERAGE=yes
8383
- stage: Test
8484
php: 7.2
85-
env: DB=mysqli MYSQL_VERSION=5.7 COVERAGE=yes
85+
env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes
8686
sudo: required
8787
before_script:
8888
- bash ./tests/travis/install-mysql-5.7.sh

tests/travis/install-mysql-5.7.sh

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22

33
set -ex
44

5-
echo "Installing MySQL 5.7..."
5+
echo "Starting MySQL 5.7..."
66

7-
sudo service mysql stop
8-
sudo apt-get remove "^mysql.*"
9-
sudo apt-get autoremove
10-
sudo apt-get autoclean
11-
echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
12-
wget http://dev.mysql.com/get/mysql-apt-config_0.8.9-1_all.deb
13-
sudo DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.9-1_all.deb
14-
sudo rm -rf /var/lib/apt/lists/*
15-
sudo apt-get clean
16-
sudo apt-get update -q
17-
sudo apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" mysql-server libmysqlclient-dev
18-
sudo mysql_upgrade
19-
20-
echo "Restart mysql..."
21-
sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
7+
sudo docker run \
8+
-d \
9+
-e MYSQL_ALLOW_EMPTY_PASSWORD=yes \
10+
-e MYSQL_DATABASE=doctrine_tests \
11+
-p 33306:3306 \
12+
--name mysql57 \
13+
mysql:5.7
2214

15+
sudo docker exec -i mysql57 bash <<< 'until echo \\q | mysql doctrine_tests > /dev/null 2>&1 ; do sleep 1; done'

0 commit comments

Comments
 (0)