Skip to content

Commit 95b4a39

Browse files
authored
MariaDB CI Fixups (#328)
- Address a change in the MariaDB docker image that replaces `mysqladmin` with `mariadb-admin` that causes our health check command for the CI pipeline service setup to fail. - Additionally note a bug in their code that causes a non-zero exit upon auth failures: https://jira.mariadb.org/browse/MDEV-31550 - Semi related: ensure that `openssh-client` is included in the devcontainer. - Used to be pulled in by `git`, but no longer.
1 parent 5c170ce commit 95b4a39

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,9 @@ jobs:
143143
MARIADB_DATABASE: benchbase
144144
MARIADB_USER: admin
145145
MARIADB_PASSWORD: password
146+
# Use status instead of ping due to exit code issues: https://jira.mariadb.org/browse/MDEV-31550
146147
options: >-
147-
--health-cmd "mysqladmin ping"
148+
--health-cmd "mariadb-admin status -uroot -prootyMcRooty"
148149
--health-interval 10s
149150
--health-timeout 5s
150151
--health-retries 5

docker/benchbase/devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source = "https://github.com/cmu-db/benchbase/"
88
# Also add a few nice cli tools.
99
RUN apt-get update \
1010
&& apt-get -y upgrade \
11-
&& apt-get -y install --no-install-recommends sudo vim-nox neovim less bash-completion colordiff git jq \
11+
&& apt-get -y install --no-install-recommends sudo vim-nox neovim less bash-completion colordiff git openssh-client jq \
1212
&& apt-get clean && rm -rf /var/lib/apt/lists/*
1313

1414
# Add a containeruser that allows vscode/codespaces to map the local host user

0 commit comments

Comments
 (0)