From 52367c31effeb639dfb7a5d2618871ed53a25cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= <carlos@cdalvaro.io>
Date: Fri, 26 Feb 2021 09:26:44 +0100
Subject: [PATCH] feat: Upgrade salt-master to 3002.5 Magnesium

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 CHANGELOG.md                         | 6 +++++-
 Dockerfile                           | 2 +-
 README.md                            | 8 ++++----
 VERSION                              | 2 +-
 docker-compose.yml                   | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 95bc0bd0..f2472f50 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.4]
+ - Image tag: [e.g. 3002.5]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80ee3b25..d41b6700 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.4.html) for the list of changes in SaltStack.
+Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.5.html) for the list of changes in SaltStack.
+
+**3002.5**
+
+- Upgrade `salt-master` to `3002.5` *Magnesium*
 
 **3002.4**
 
diff --git a/Dockerfile b/Dockerfile
index 8248051c..13dcb489 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.4" \
+ENV SALT_VERSION="3002.5" \
     PYTHON_VERSION="3.8"
 
 ENV IMAGE_VERSION="${SALT_VERSION}"
diff --git a/README.md b/README.md
index 42c0acd9..8fcc880e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![StackOverflow Community][stackoverflow_badge]][stackoverflow_community]
 [![Slack Community][slack_badge]][slack_community]
 
-# Dockerized SaltStack Master v3002.4 _Magnesium_
+# Dockerized SaltStack Master v3002.5 _Magnesium_
 
 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
 
@@ -47,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.4
+docker pull cdalvaro/docker-salt-master:3002.5
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -531,8 +531,8 @@ 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.4-lightgrey.svg?style=flat-square&logo=Saltstack
-[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.4.html "SaltStack Release Notes"
+[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.5-lightgrey.svg?style=flat-square&logo=Saltstack
+[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.5.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
diff --git a/VERSION b/VERSION
index 1163770c..6658b70f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3002.4
\ No newline at end of file
+3002.5
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b3ee020..bcb17964 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.4
+    image: cdalvaro/docker-salt-master:3002.5
     restart: always
     volumes:
       - "roots/:/home/salt/data/srv"