From 805704177444acedad5b45c0fbbbe7431fcb3337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Thu, 10 Nov 2022 15:50:54 +0100
Subject: [PATCH] Upgrade salt-master to 3005.1-2 Phosphorus

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 .github/workflows/build-and-test.yml | 4 +++-
 CHANGELOG.md                         | 4 ++++
 Dockerfile                           | 4 ++--
 Makefile                             | 2 +-
 README.md                            | 6 +++---
 VERSION                              | 2 +-
 tests/basic/test.sh                  | 5 +++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 22ef59b..c7bc2df 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.1_2`]
+ - Image tag: [e.g. `3005.1-2`]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 69878ac..273698b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -133,11 +133,13 @@ jobs:
       - name: Install and configure salt-minion
         run: |
           # Install salt-minion from salt repos
+          VERSION=$(cat VERSION)
           curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
           chmod +x bootstrap-salt.sh
-          sudo ./bootstrap-salt.sh -dXP stable $(cat VERSION)
+          sudo ./bootstrap-salt.sh -dXP stable "${VERSION%%-*}"
           sudo systemctl stop salt-minion
           sudo systemctl disable salt-minion
+          sudo rm -f /var/log/salt/minion
 
       - name: Execute basic tests
         if: always()
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e88a87a..0a3b8c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This file only reflects the changes that are made in this image.
 Please refer to the [Salt 3005.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.1.html)
 for the list of changes in SaltStack.
 
+**3005.1-2**
+
+- Upgrade `salt-master` to `3005.1-2` *Phosphorus*.
+
 **3005.1_2**
 
 - Add support for GPG keys.
diff --git a/Dockerfile b/Dockerfile
index db17460..f08b438 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.1"
-ENV IMAGE_VERSION="${SALT_VERSION}_2"
+ENV SALT_VERSION="3005.1-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 150af2f..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)_2
+		cdalvaro/docker-salt-master:$(shell cat VERSION)
 
 quickstart:
 	@echo "Starting docker-salt-master container..."
diff --git a/README.md b/README.md
index 5a59080..4a87ee3 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.1 _Phosphorus_
+# Dockerized Salt Master v3005.1-2 _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_2
+docker pull ghcr.io/cdalvaro/docker-salt-master:3005.1-2
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -768,7 +768,7 @@ 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.1-lightgrey.svg?logo=Saltstack
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3005.1--2-lightgrey.svg?logo=Saltstack
 
 [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"
 
diff --git a/VERSION b/VERSION
index b83028d..23a2be5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3005.1
\ No newline at end of file
+3005.1-2
\ No newline at end of file
diff --git a/tests/basic/test.sh b/tests/basic/test.sh
index c5b2171..fb276de 100755
--- a/tests/basic/test.sh
+++ b/tests/basic/test.sh
@@ -19,8 +19,9 @@ ok "container started"
 # Check salt version
 echo "==> Checking salt-master version ..."
 docker-exec salt-master --versions
-[[ "$(docker-exec salt-master --version)" == "salt-master $(cat VERSION)" ]] || error "salt-master version"
-ok "salt-master version"
+EXPECTED_VERSION="$(cat VERSION)"
+CURRENT_VERSION="$(docker-exec salt-master --version)"
+check_equal "${CURRENT_VERSION}" "salt-master ${EXPECTED_VERSION%%-*}" "salt-master --version"
 
 # Test image calling healthcheck
 echo "==> Executing healthcheck ..."