From 328389195e25f0eafddd60d3cc4ecd3cdc603f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Fri, 7 Aug 2020 22:04:06 +0200 Subject: [PATCH] feat: Upgrade SaltStack Master to 3001.1 Sodium --- CHANGELOG.md | 9 ++++++++- Dockerfile | 2 +- README.md | 30 +++++++++++++++--------------- VERSION | 2 +- docker-compose.yml | 2 +- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12f0bd5..771e95d 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/3001.html) for the list of changes in SaltStack. +Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3001.1.html) for the list of changes in SaltStack. + +**3001.1** + +- Upgrade SaltStack Master to `3001.1` *Sodium* +- Upgrade `m2crypto` to version `0.36.0` +- Change Docker base image to `ubuntu:focal-20200720` +- Bring back support for ARM v7 **3001** diff --git a/Dockerfile b/Dockerfile index 862cd75..ec61e6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3001" \ +ENV SALT_VERSION="3001.1" \ PYTHON_VERSION="3.8" \ LIBSSH2_VERSION="1.9.0" \ LIBGIT2_VERSION="1.0.1" \ diff --git a/README.md b/README.md index 587b359..0b6d996 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Docker Image Size][docker_size_badge]][docker_hub_tags] [![CodeFactor][codefactor_badge]][codefactor_score] -# Dockerized SaltStack Master Sodium v3001 +# Dockerized SaltStack Master Sodium v3001.1 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform. @@ -41,7 +41,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:3001 +docker pull cdalvaro/saltstack-master:3001.1 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -84,7 +84,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:3001 + cdalvaro/saltstack-master:3001.1 ``` ## Configuration @@ -111,7 +111,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:3001 + cdalvaro/saltstack-master:3001.1 ``` ### Master Signed Keys @@ -126,7 +126,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:3001 + cdalvaro/saltstack-master:3001.1 ``` The container will create the `master_sign` key and its signature. @@ -138,7 +138,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:3001 \ + cdalvaro/saltstack-master:3001.1 \ app:gen-signed-keys new_master_sign ``` @@ -168,7 +168,7 @@ docker run --name salt_stack --detach \ --env 'SALT_API_USER_PASS=SuperCool/Password10' --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3001 + cdalvaro/saltstack-master:3001.1 ``` By default, user `salt_api` is created and you can set its password by setting the environment variable @@ -236,7 +236,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:3001 + cdalvaro/saltstack-master:3001.1 ``` ### Git Fileserver @@ -324,7 +324,7 @@ docker run --name salt_stack -it --rm \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/3pfs/:/home/salt/data/3pfs/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/saltstack-master:3001 + cdalvaro/saltstack-master:3001.1 ``` If you need to add more third party formulas, you can restart the container, or you can type the following command: @@ -348,7 +348,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:3001 + cdalvaro/saltstack-master:3001.1 ``` Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate. @@ -367,7 +367,7 @@ version: '3' services: master: container_name: salt_master - image: cdalvaro/saltstack-master:3001 + image: cdalvaro/saltstack-master:3001.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] start_period: 30s @@ -386,7 +386,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:3001 + cdalvaro/saltstack-master:3001.1 ``` Then you can manually check this info by running the following command: @@ -456,7 +456,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:3001 + cdalvaro/saltstack-master:3001.1 ``` ## Usage @@ -497,8 +497,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC - https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html - https://github.com/saltstack/salt/releases -[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3001-lightgrey.svg?style=flat&logo=Saltstack -[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.html "SaltStack Release Notes" +[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3001.1-lightgrey.svg?style=flat&logo=Saltstack +[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.1.html "SaltStack Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200720-E95420.svg?style=flat&logo=Ubuntu [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" diff --git a/VERSION b/VERSION index 6fc99cf..d1e07a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3001 \ No newline at end of file +3001.1 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index de93e34..596322a 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:3001 + image: cdalvaro/saltstack-master:3001.1 restart: always volumes: - "roots/:/home/salt/data/srv"