From b51c818742594350a5e3f594956ce6c3acc442bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= Date: Fri, 26 Feb 2021 07:39:56 +0100 Subject: [PATCH 1/2] fix: Redirect output to stderr with log_error --- assets/runtime/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions.sh b/assets/runtime/functions.sh index 028ed2ce..15118802 100755 --- a/assets/runtime/functions.sh +++ b/assets/runtime/functions.sh @@ -19,7 +19,7 @@ function exec_as_salt() # Log error function log_error() { - (>2& echo "ERROR: $*") + (>&2 echo "ERROR: $*") } # Map salt user with host user From f7279d906ad7e6acf53a048bad23ba746e4b929e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= Date: Fri, 26 Feb 2021 07:41:14 +0100 Subject: [PATCH 2/2] feat: Upgrade salt-master to 3002.3 Magnesium --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CHANGELOG.md | 6 +++++- Dockerfile | 2 +- README.md | 25 +++++++++++++++---------- VERSION | 2 +- docker-compose.yml | 2 +- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e87c9a49..adcda578 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ The full log with the outputted error. **Version report (please complete the following information):** - Host OS: [e.g. `uname -a`] - Docker: [`docker --version`] - - Image tag: [e.g. 3002.2] + - Image tag: [e.g. 3002.3] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 93882cde..2389db97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # 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/3002.2.html) for the list of changes in SaltStack. +Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.3.html) for the list of changes in SaltStack. + +**3002.3** + +- Upgrade `salt-master` to `3002.3` *Magnesium* **3002.2** diff --git a/Dockerfile b/Dockerfile index 7032f2c3..510e5b04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3002.2" \ +ENV SALT_VERSION="3002.3" \ PYTHON_VERSION="3.8" ENV IMAGE_VERSION="${SALT_VERSION}" diff --git a/README.md b/README.md index 5d408995..f70b680e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ [![SaltStack][saltstack_badge]][saltstack_release_notes] [![Ubuntu Image][ubuntu_badge]][ubuntu_hub_docker] -[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community] -[![Slack Community][slack_badge]][slack_community] +[![Architecture AMD64][arch_amd64_badge]][arch_link] +[![Architecture ARM64][arch_arm64_badge]][arch_link] +[![Architecture ARM/v7][arch_arm_badge]][arch_link] [![Publish Workflow][github_publish_badge]][github_publish_workflow] [![Docker Image Size][docker_size_badge]][docker_hub_tags] -[![CodeFactor][codefactor_badge]][codefactor_score] -# Dockerized SaltStack Master v3002.2 _Magnesium_ +[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community] +[![Slack Community][slack_badge]][slack_community] + +# Dockerized SaltStack Master v3002.3 _Magnesium_ Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform. @@ -44,7 +47,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/docker-salt-master/) and is the recommended method of installation. ```sh -docker pull cdalvaro/docker-salt-master:3002.2 +docker pull cdalvaro/docker-salt-master:3002.3 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -528,17 +531,19 @@ 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-v3002.2-lightgrey.svg?style=flat-square&logo=Saltstack -[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.2.html "SaltStack Release Notes" +[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.3-lightgrey.svg?style=flat-square&logo=Saltstack +[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.3.html "SaltStack Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20201008-E95420.svg?style=flat-square&logo=Ubuntu [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?style=flat-square&label=build&logo=GitHub&logoColor=%23181717 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22 [docker_size_badge]: https://img.shields.io/docker/image-size/cdalvaro/docker-salt-master/latest?style=flat-square&logo=docker&color=2496ED [docker_hub_tags]: https://hub.docker.com/repository/docker/cdalvaro/docker-salt-master/tags -[codefactor_badge]: https://img.shields.io/codefactor/grade/github/cdalvaro/docker-salt-master?style=flat-square&logo=CodeFactor -[codefactor_score]: https://www.codefactor.io/repository/github/cdalvaro/docker-salt-master [stackoverflow_badge]: https://img.shields.io/badge/stackoverflow-community-orange?style=flat-square&logo=stackoverflow&color=FE7A16 [stackoverflow_community]: https://stackoverflow.com/tags/salt-stack [slack_badge]: https://img.shields.io/badge/slack-@saltstackcommunity-blue.svg?style=flat-square&logo=slack&logoColor=4A154B&color=4A154B -[slack_community]: https://saltstackcommunity.herokuapp.com \ No newline at end of file +[slack_community]: https://saltstackcommunity.herokuapp.com +[arch_amd64_badge]: https://img.shields.io/badge/arch-amd64-inactive.svg?style=flat-square +[arch_arm_badge]: https://img.shields.io/badge/arch-arm/v7-inactive.svg?style=flat-square +[arch_arm64_badge]: https://img.shields.io/badge/arch-arm64-inactive.svg?style=flat-square +[arch_link]: https://github.com/users/cdalvaro/packages/container/package/docker-salt-master diff --git a/VERSION b/VERSION index 60079b93..fec6199e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3002.2 \ No newline at end of file +3002.3 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index dd22641a..ca4e73cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: master: container_name: salt_master - image: cdalvaro/docker-salt-master:3002.2 + image: cdalvaro/docker-salt-master:3002.3 restart: always volumes: - "roots/:/home/salt/data/srv"