diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a87a88c..0d859dd 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. `3004.2`] + - Image tag: [e.g. `3005rc1`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f0c348..8176013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog This file only reflects the changes that are made in this image. -Please refer to the [Salt 3004.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.2.html) +Please refer to the [Salt 3005 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.html) for the list of changes in SaltStack. -**3004.2_1** +**3005** +- Upgrade `salt-master` to `3005` *Phosphorus* - Change Docker base image to `ubuntu:jammy-20220531` - Upgrade Python to version `3.10` - Install `python3-pygit2` version `1.6.1` from Ubuntu repositories diff --git a/Dockerfile b/Dockerfile index 6861c61..3e0db21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF # https://github.com/saltstack/salt/releases # NOTE: Review org.label-schema.version label if necessary -ENV SALT_VERSION="3004.2" \ +ENV SALT_VERSION="3005rc1" \ PYTHON_VERSION="3.10" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ diff --git a/README.md b/README.md index 23135ad..04df47d 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 v3004.2 _Silicon_ +# Dockerized Salt Master v3005 _Phosphorus_ Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform. @@ -46,7 +46,7 @@ For other methods to install `salt-master` please refer to the [Official Salt Pr 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:3004.2 +docker pull cdalvaro/docker-salt-master:3005rc1 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -593,8 +593,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC - https://docs.saltproject.io/en/getstarted/ - https://docs.saltproject.io/en/latest/contents.html -[saltproject_badge]: https://img.shields.io/badge/Salt-v3004.2-lightgrey.svg?logo=Saltstack -[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.2.html "Salt Project Release Notes" +[saltproject_badge]: https://img.shields.io/badge/Salt-v3005rc1-lightgrey.svg?logo=Saltstack +[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005rc1.html "Salt Project Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20220531-E95420.svg?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?label=build&logo=GitHub&logoColor=%23181717 diff --git a/VERSION b/VERSION index c15006a..501efb3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3004.2 +3005rc1