From 90d098c8f233bef69a509c88b460160618b2cf85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:40:11 +0100 Subject: [PATCH] feat: Add salt-master healthcheck --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index dae2b9d..7c160ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,11 +46,6 @@ RUN apt-get update \ COPY assets/build ${SALT_BUILD_DIR} RUN bash ${SALT_BUILD_DIR}/install.sh -# Shared resources -EXPOSE 4505/tcp 4506/tcp -RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR} ${SALT_LOGS_DIR} -VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" "${SALT_LOGS_DIR}" ] - COPY assets/runtime ${SALT_RUNTIME_DIR} RUN chmod -R +x ${SALT_RUNTIME_DIR} @@ -61,6 +56,14 @@ RUN rm -rf ${SALT_BUILD_DIR}/* COPY entrypoint.sh /sbin/entrypoint.sh RUN chmod +x /sbin/entrypoint.sh +# Shared resources +EXPOSE 4505/tcp 4506/tcp +RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR} ${SALT_LOGS_DIR} +VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" "${SALT_LOGS_DIR}" ] + +HEALTHCHECK --interval=2m --timeout=30s --start-period=1m --retries=5 \ + CMD [ "salt-call", "--local", "status.ping_master", "127.0.0.1" ] + LABEL \ maintainer="carlos@cdalvaro.io" \ org.label-schema.vendor=cdalvaro \