From f5ef2194340f48e8ea4d5eb09a9298c20a783680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= <carlos@cdalvaro.io>
Date: Sat, 6 May 2023 10:12:29 +0200
Subject: [PATCH] Upgrade salt-master to 3006.1 Sulfur

---
 .github/ISSUE_TEMPLATE/bug_report.md | 7 ++++---
 CHANGELOG.md                         | 7 ++++++-
 Dockerfile                           | 2 +-
 README.md                            | 8 ++++----
 VERSION                              | 2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ed3abf4..b48f87f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
 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.0`]
+
+  - Host OS: [e.g. `uname -a`]
+  - Docker: [e.g. `docker --version`]
+  - Image tag: [e.g. `3006.1`]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b73a12..6752613 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
 This file only reflects the changes that are made in this image.
-Please refer to the [Salt 3006.0 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.0.html)
+Please refer to the [Salt 3006.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.1.html)
 for the list of changes in SaltStack.
 
+**3006.1**
+
+- Upgrade `salt-master` to `3006.1` *Sulfur*.
+- Change Docker base image to `ubuntu:jammy-20230425`.
+
 **3006.0**
 
 - Upgrade `salt-master` to `3006.0` *Sulfur*.
diff --git a/Dockerfile b/Dockerfile
index d57deae..5b12a61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3006.0"
+ENV SALT_VERSION="3006.1"
 ENV IMAGE_VERSION="${SALT_VERSION}"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
diff --git a/README.md b/README.md
index 9b1e7ab..cbb23a9 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.0 _Sulfur_
+# Dockerized Salt Master v3006.1 _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.0
+docker pull ghcr.io/cdalvaro/docker-salt-master:3006.1
 ```
 
 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.0-lightgrey.svg?logo=Saltstack
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3006.1-lightgrey.svg?logo=Saltstack
 
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.0.html "Salt Project Release Notes"
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.1.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 6db4c79..21cd70c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3006.0
\ No newline at end of file
+3006.1
\ No newline at end of file