Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
765432ad
Unverified
Commit
765432ad
authored
Feb 28, 2020
by
Grégoire Paris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace external health check with native one
Hopefully it will work more reliably.
parent
74759930
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
install-mariadb.sh
tests/travis/install-mariadb.sh
+6
-1
install-mysql-5.7.sh
tests/travis/install-mysql-5.7.sh
+6
-1
install-mysql-8.0.sh
tests/travis/install-mysql-8.0.sh
+6
-1
No files found.
tests/travis/install-mariadb.sh
View file @
765432ad
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
set
-ex
set
-ex
sudo
docker run
\
sudo
docker run
\
--health-cmd
=
'mysqladmin ping --silent'
\
-d
\
-d
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
...
@@ -10,4 +11,8 @@ sudo docker run \
...
@@ -10,4 +11,8 @@ sudo docker run \
--name
mariadb
\
--name
mariadb
\
mariadb:
${
MARIADB_VERSION
}
mariadb:
${
MARIADB_VERSION
}
sudo
docker
exec
-i
mariadb bash
<<<
'until echo \\q | mysql doctrine_tests > /dev/null 2>&1 ; do sleep 1; done'
until
[
"
$(
sudo
docker inspect
--format
"{{json .State.Health.Status }}"
mariadb
)
"
==
"
\"
healthy
\"
"
]
do
echo
"Waiting for MariaDB to become ready…"
sleep
1
done
tests/travis/install-mysql-5.7.sh
View file @
765432ad
...
@@ -5,6 +5,7 @@ set -ex
...
@@ -5,6 +5,7 @@ set -ex
echo
"Starting MySQL 5.7..."
echo
"Starting MySQL 5.7..."
sudo
docker run
\
sudo
docker run
\
--health-cmd
=
'mysqladmin ping --silent'
\
-d
\
-d
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
...
@@ -12,4 +13,8 @@ sudo docker run \
...
@@ -12,4 +13,8 @@ sudo docker run \
--name
mysql57
\
--name
mysql57
\
mysql:5.7
mysql:5.7
sudo
docker
exec
-i
mysql57 bash
<<<
'until echo \\q | mysql doctrine_tests > /dev/null 2>&1 ; do sleep 1; done'
until
[
"
$(
sudo
docker inspect
--format
"{{json .State.Health.Status }}"
mysql57
)
"
==
"
\"
healthy
\"
"
]
do
echo
"Waiting for MySQL to become ready…"
sleep
1
done
tests/travis/install-mysql-8.0.sh
View file @
765432ad
...
@@ -6,6 +6,7 @@ echo "Starting MySQL 8.0..."
...
@@ -6,6 +6,7 @@ echo "Starting MySQL 8.0..."
sudo
docker pull mysql:8.0
sudo
docker pull mysql:8.0
sudo
docker run
\
sudo
docker run
\
--health-cmd
=
'mysqladmin ping --silent'
\
-d
\
-d
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_ALLOW_EMPTY_PASSWORD
=
yes
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
-e
MYSQL_DATABASE
=
doctrine_tests
\
...
@@ -14,4 +15,8 @@ sudo docker run \
...
@@ -14,4 +15,8 @@ sudo docker run \
mysql:8.0
\
mysql:8.0
\
--default-authentication-plugin
=
mysql_native_password
--default-authentication-plugin
=
mysql_native_password
sudo
docker
exec
-i
mysql80 bash
<<<
'until echo \\q | mysql doctrine_tests > /dev/null 2>&1 ; do sleep 1; done'
until
[
"
$(
sudo
docker inspect
--format
"{{json .State.Health.Status }}"
mysql80
)
"
==
"
\"
healthy
\"
"
]
do
echo
"Waiting for MySQL to become ready…"
sleep
1
done
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment