Skip to content

Commit fc1dc06

Browse files
authored
Merge pull request #516 from Automattic/disable-mysql-ssl
fix(wpvip-base): disable SSL when checking MySQL status
2 parents cfc05fb + 3dd7d09 commit fc1dc06

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

images/src/wpvip-base/.devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"x-build": {
77
"name": "WPVIP",
88
"image-name": "wpvip-base",
9-
"image-version": "0.0.25"
9+
"image-version": "0.0.26"
1010
},
1111
"remoteUser": "vscode",
1212
"postStartCommand": "/usr/local/bin/post-start.sh",

images/src/wpvip-base/rootfs/usr/local/bin/post-start.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ echo "Checking out submodules..."
1919

2020
echo "Waiting for MySQL to come online..."
2121
second=0
22-
while ! mysqladmin ping -uroot -ppassword -hdatabase --silent && [ "${second}" -lt 60 ]; do
22+
while ! mysqladmin ping -uroot -ppassword -hdatabase --silent --ssl=0 && [ "${second}" -lt 60 ]; do
2323
sleep 1
24-
second=$((second+1))
24+
second=$((second + 1))
2525
done
26-
if ! mysqladmin ping -uroot -ppassword -hdatabase --silent; then
26+
if ! mysqladmin ping -uroot -ppassword -hdatabase --silent --ssl=0; then
2727
echo "ERROR: mysql has failed to come online"
28-
exit 1;
28+
exit 1
2929
fi
3030

3131
sudo -u www-data -E wp core install \

0 commit comments

Comments
 (0)