From 265b066b3d755871e33685e4a4a940d21b28c6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 15 Jan 2020 21:11:01 +0100 Subject: [PATCH] feat: Upgrade SaltStack Master to 2019.2.3 --- CHANGELOG.md | 11 +++++++++-- Dockerfile | 2 +- README.md | 18 +++++++++--------- VERSION | 2 +- docker-compose.yml | 2 +- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe5c1ab..4ba9e7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Changelog 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/2019.2.2.html) for the list of changes in SaltStack. +Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/2019.2.3.html) for the list of changes in SaltStack. + +**2019.2.3** + +- Upgrade SaltStack Master to `2019.2.3` +- Change Docker base image to `ubuntu:bionic-20191202` +- Upgrade `libgit2` to version `0.28.4` +- Upgrade `pygit2` to version `1.0.2` **2019.2.2** @@ -12,7 +19,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late - Upgrade SaltStack Master to `2019.2.1` - Change Docker base image to `ubuntu:bionic-20190912.1` -- Upgrade `pygit2` to version `1.9.0` +- Upgrade `libssh2` to version `1.9.0` - Upgrade `m2crypto` to version `0.35.2` **2019.2.0** diff --git a/Dockerfile b/Dockerfile index 084b531..5273e6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="2019.2.2" \ +ENV SALT_VERSION="2019.2.3" \ PYTHON_VERSION="3.6" \ LIBSSH2_VERSION="1.9.0" \ LIBGIT2_VERSION="0.28.4" \ diff --git a/README.md b/README.md index f1484c3..61a8407 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SaltStack Master v2019.2.2 +# SaltStack Master v2019.2.3 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:2019.2.2 +docker pull cdalvaro/saltstack-master:2019.2.3 ``` 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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` ## 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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` ### 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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` 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). @@ -115,7 +115,7 @@ Additionally, you can generate new keys by executing the following command: ```sh docker run --name salt_stack -it --rm \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:2019.2.2 app:gen-signed-keys other_master_sign + cdalvaro/saltstack-master:2019.2.3 app:gen-signed-keys other_master_sign ``` The newly created keys will appear inside `keys/generated/other_master_sign` directory. @@ -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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` ### 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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` 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:2019.2.2 + cdalvaro/saltstack-master:2019.2.3 ``` ## Usage diff --git a/VERSION b/VERSION index e9cf9e9..bcaaf29 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2019.2.2 \ No newline at end of file +2019.2.3 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 011b24f..5496963 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:2019.2.2 + image: cdalvaro/saltstack-master:2019.2.3 restart: always volumes: - "roots/:/home/salt/data/srv"