From e60fd158ce6a7e8789103c92e01e9bf6ea117ec4 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 21 Feb 2022 11:34:26 -0800 Subject: [PATCH 1/2] Updated healthcheck.sh Removed ambiguity around the mysqladmin connection string by specifying host/port --- healthcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/healthcheck.sh b/healthcheck.sh index 3357894..de4630b 100755 --- a/healthcheck.sh +++ b/healthcheck.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -mysqladmin ping -u root --password=$MYSQL_ROOT_PASSWORD | grep -i 'mysqld is alive' || exit 1 +mysqladmin ping --host=127.0.0.1 --port=3306 --user=root --password=$MYSQL_ROOT_PASSWORD | grep -i 'mysqld is alive' || exit 1 exit 0 From f04130361809d25b55e90fc6494947f68c823270 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 21 Feb 2022 11:34:56 -0800 Subject: [PATCH 2/2] Fixes typo in the image name in CI builds --- .github/workflows/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 408ab40..368459b 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -17,7 +17,7 @@ defaults: shell: bash env: - IMAGE: docksal/mariabdb + IMAGE: docksal/mariadb #DOCKSAL_VERSION: develop jobs: