From 3b31c6d2f59f6e4fe07fd7938d110b485211f85a Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 8 Sep 2020 09:44:35 -0700 Subject: [PATCH] Change `HEALTHCHECK` to use `step ca health`. Change shell `CMD exec` to skip redundant `/bin/sh -c` --- docker/Dockerfile.step-ca | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.step-ca b/docker/Dockerfile.step-ca index 6e902b68..4a1908d6 100644 --- a/docker/Dockerfile.step-ca +++ b/docker/Dockerfile.step-ca @@ -22,6 +22,6 @@ ENV PWDPATH="/home/step/secrets/password" VOLUME ["/home/step"] STOPSIGNAL SIGTERM -HEALTHCHECK CMD curl --cacert /home/step/certs/root_ca.crt -sSf https://localhost/health >/dev/null || exit 1 +HEALTHCHECK CMD step ca health 2>/dev/null | grep "^ok" >/dev/null -CMD exec /bin/sh -c "/usr/local/bin/step-ca --password-file $PWDPATH $CONFIGPATH" +CMD exec /usr/local/bin/step-ca --password-file $PWDPATH $CONFIGPATH