diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0429b54..9f709d9 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: [e.g. `docker --version`] - - Image tag: [e.g. `3005`] + - Image tag: [e.g. `3005.1`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 439bd8b..73f4f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ for the list of changes in SaltStack. **3005.1** +- Upgrade `salt-master` to `3005.1` *Phosphorus* - Upgrade `salt-bootstrap` to version `2022.10.04` - Change Docker base image to `ubuntu:jammy-20220815` diff --git a/Dockerfile b/Dockerfile index a33ff74..de271f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3005" -ENV IMAGE_VERSION="${SALT_VERSION}_1" +ENV SALT_VERSION="3005.1" +ENV IMAGE_VERSION="${SALT_VERSION}" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ diff --git a/README.md b/README.md index a05d6b4..ce7aa63 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Architecture ARM64][arch_arm64_badge]][arch_link] [![Architecture ARM/v7][arch_arm_badge]][arch_link] -# Dockerized Salt Master v3005 _Phosphorus_ +# Dockerized Salt Master v3005.1 _Phosphorus_ Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform. @@ -24,7 +24,7 @@ Automated builds of the image are available on the recommended method of installation. ```sh -docker pull ghcr.io/cdalvaro/docker-salt-master:3005_1 +docker pull ghcr.io/cdalvaro/docker-salt-master:3005.1 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -717,9 +717,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-v3005-lightgrey.svg?logo=Saltstack +[saltproject_badge]: https://img.shields.io/badge/Salt-v3005.1-lightgrey.svg?logo=Saltstack -[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.html "Salt Project Release Notes" +[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20220815-E95420.svg?logo=Ubuntu diff --git a/VERSION b/VERSION index 5528a3e..b83028d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3005 \ No newline at end of file +3005.1 \ No newline at end of file