diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dc8b3e8..9e1a1a3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,6 +12,7 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Minimum salt configuration file 2. Minimum salt state to reproduce the error 3. Additional required files to reproduce the error @@ -25,9 +26,9 @@ The full log with the outputted error. **Version report (please complete the following information):** - - Host OS: [e.g. `uname -a`] - - Docker: [e.g. `docker --version`] - - Image tag: [e.g. `3006.1_1`] +- Host OS: [e.g. `uname -a`] +- Docker: [e.g. `docker --version`] +- Image tag: [e.g. `3006.2`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index f119dcc..02825cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog This file only reflects the changes that are made in this image. -Please refer to the [Salt 3006.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.1.html) +Please refer to the [Salt 3006.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.2.html) for the list of changes in SaltStack. +**3006.2** + +- Upgrade `salt-master` to `3006.2` *Sulfur*. + **3006.1_1** - Stream `salt-master` output to stdout and stderr. diff --git a/Dockerfile b/Dockerfile index 54c4ae3..f0a42eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3006.1" -ENV IMAGE_VERSION="${SALT_VERSION}_1" +ENV SALT_VERSION="3006.2" +ENV IMAGE_VERSION="${SALT_VERSION}" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ diff --git a/Makefile b/Makefile index a27d942..49c59fb 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ build: release: build @docker tag cdalvaro/docker-salt-master:latest \ - cdalvaro/docker-salt-master:$(shell cat VERSION)_1 + cdalvaro/docker-salt-master:$(shell cat VERSION) quickstart: @echo "Starting docker-salt-master container..." diff --git a/README.md b/README.md index cbb23a9..f63d6d5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Architecture AMD64][arch_amd64_badge]][arch_link] [![Architecture ARM64][arch_arm64_badge]][arch_link] -# Dockerized Salt Master v3006.1 _Sulfur_ +# Dockerized Salt Master v3006.2 _Sulfur_ Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform. @@ -23,7 +23,7 @@ Automated builds of the image are available on the recommended method of installation. ```sh -docker pull ghcr.io/cdalvaro/docker-salt-master:3006.1 +docker pull ghcr.io/cdalvaro/docker-salt-master:3006.2 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -786,9 +786,9 @@ Many thanks to: - https://docs.saltproject.io/en/getstarted/ - https://docs.saltproject.io/en/latest/contents.html -[saltproject_badge]: https://img.shields.io/badge/Salt-v3006.1-lightgrey.svg?logo=Saltstack +[saltproject_badge]: https://img.shields.io/badge/Salt-v3006.2-lightgrey.svg?logo=Saltstack -[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.1.html "Salt Project Release Notes" +[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.2.html "Salt Project Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20230425-E95420.svg?logo=Ubuntu diff --git a/VERSION b/VERSION index 21cd70c..5d3f026 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3006.1 \ No newline at end of file +3006.2 \ No newline at end of file