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 1/5] 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 \ From 58689f50a09286ad1af54ae92e159d1485a4445b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:40:51 +0100 Subject: [PATCH 2/5] feat: Change Docker base image to ubuntu:bionic-20200311 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c160ed..c9b52a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20200112 +FROM ubuntu:bionic-20200311 ARG BUILD_DATE ARG VCS_REF From 8e1ae658c3b7e78da62ad6b50dad94418a633c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:41:43 +0100 Subject: [PATCH 3/5] feat: Update image tag to 3000_1 --- README.md | 16 ++++++++-------- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index da1333c..c9d83d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SaltStack Master v3000 +# SaltStack Master v3000_1 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform. @@ -30,7 +30,7 @@ For other methods to install SaltStack please refer to the [Official SaltStack I Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/saltstack-master/) and is the recommended method of installation. ```sh -docker pull cdalvaro/saltstack-master:3000 +docker pull cdalvaro/saltstack-master:3000_1 ``` You can also pull the latest tag which is built from the repository HEAD @@ -67,7 +67,7 @@ docker run --name salt_master --detach \ --env 'SALT_LOG_LEVEL=info' \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` ## Configuration @@ -91,7 +91,7 @@ docker run --name salt_master -d \ --env 'SALT_LOG_LEVEL=info' \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` ### Master Signed Keys @@ -105,7 +105,7 @@ docker run --name salt_stack --detach \ --env 'SALT_MASTER_SIGN_PUBKEY=True' --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` The container will create the `master_sign` key and its signature. More information about how to configure the minion service can be found [here](https://docs.saltstack.com/en/latest/topics/tutorials/multimaster_pki.html#prepping-the-minion-to-verify-received-public-keys). @@ -131,7 +131,7 @@ docker run --name salt_stack -it --rm \ --env "USERMAP_UID=$(id -u)" --env "USERMAP_GID=$(id -g)" \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` ### Git Fileserver @@ -187,7 +187,7 @@ docker run --name salt_master --detach \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ --volume $(pwd)/logs/:/home/salt/data/logs/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate. @@ -233,7 +233,7 @@ docker run --name salt_master -d \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ --volume $(pwd)/config/:/home/salt/data/config/ \ - cdalvaro/saltstack-master:3000 + cdalvaro/saltstack-master:3000_1 ``` ## Usage diff --git a/VERSION b/VERSION index 8da85a2..2f546cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3000 \ No newline at end of file +3000_1 diff --git a/docker-compose.yml b/docker-compose.yml index e1f1f4e..3ea1d47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: master: container_name: salt_master - image: cdalvaro/saltstack-master:3000 + image: cdalvaro/saltstack-master:3000_1 restart: always volumes: - "roots/:/home/salt/data/srv" From 9e92f8a11a60524c413a819d2672c6db69501018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:42:06 +0100 Subject: [PATCH 4/5] doc: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49931a7..2eb6358 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3000.html) for the list of changes in SaltStack. +**3000_1** + +- Add container healthcheck +- Change Docker base image to `ubuntu:bionic-20200311` + **3000** - Upgrade SaltStack Master to `3000` *Neon* From 1f6501fc25cf5c9f6b213bc1b296fc99aa687691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:45:43 +0100 Subject: [PATCH 5/5] doc: Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c9d83d0..0c69e81 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,18 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co docker pull cdalvaro/saltstack-master:3000_1 ``` -You can also pull the latest tag which is built from the repository HEAD +You can also pull the latest tag which is built from the repository `HEAD` ```sh docker pull cdalvaro/saltstack-master:latest ``` +or from [Quay.io](https://quay.io/repository/cdalvaro/saltstack-master) too. + +```sh +docker pull quay.io/cdalvaro/saltstack-master:latest +``` + Alternatively you can build the image locally. ```sh