Upgrade salt-master to 3006.0 Sulfur

.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_1`]
+ - Image tag: [e.g. `3006.0`]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build-and-test.yml

@@ -133,10 +133,8 @@ 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 sh bootstrap-salt.sh -dXP stable
-          sudo ./bootstrap-salt.sh -dXP stable "${VERSION%%-*}"
           sudo systemctl stop salt-minion
           sudo systemctl disable salt-minion
           sudo rm -f /var/log/salt/minion

CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
 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)
+Please refer to the [Salt 3006 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.html)
 for the list of changes in SaltStack.
 
-**3006**
+**3006.0**
 
+- Upgrade `salt-master` to `3006.0` *Sulfur*.
+- Upgrade `salt-bootstrap` to version `2023.04.06`.
 - Change Docker base image to `ubuntu:jammy-20230308`.
 
 **3005.1-2_1**

Dockerfile

@@ -4,8 +4,8 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3005.1-2"
+ENV SALT_VERSION="3006.0"
-ENV IMAGE_VERSION="${SALT_VERSION}_1"
+ENV IMAGE_VERSION="${SALT_VERSION}"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
     SALT_ROOT_DIR="/etc/salt" \

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-2 _Phosphorus_
+# Dockerized Salt Master v3006.0 _Sulfur_
 
 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_1
+docker pull ghcr.io/cdalvaro/docker-salt-master:3006.0
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -492,7 +492,7 @@ gpg --armor --batch --trust-model always --encrypt --recipient "${KEY_ID}" \
 cat /tmp/gpg_id_ed25519
 ```
 
-On macOS you can pipe the output to `pbcopy` to copy the encrypted data to the clipboard. If you are using Linux, you
+On macOS, you can pipe the output to `pbcopy` to copy the encrypted data to the clipboard. If you are using Linux, you
 can use `xclip` or `xsel`.
 
 ### 3rd Party Formulas
@@ -787,9 +787,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.1--2-lightgrey.svg?logo=Saltstack
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3006.0-lightgrey.svg?logo=Saltstack
 
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.0.html "Salt Project Release Notes"
 
 [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20230308-E95420.svg?logo=Ubuntu
 

VERSION

@@ -1 +1 @@
-3005.1-2
+3006.0

assets/build/install.sh

@@ -39,10 +39,10 @@ install_pkgs --quiet \
   python3-pygit2
 
 # Downloading bootstrap-salt.sh script
-BOOTSTRAP_VERSION='2022.10.04'
+BOOTSTRAP_VERSION='2023.04.06'
-BOOTSTRAP_URL="https://raw.githubusercontent.com/saltstack/salt-bootstrap/v${BOOTSTRAP_VERSION}/bootstrap-salt.sh"
+BOOTSTRAP_URL="https://github.com/saltstack/salt-bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-salt.sh"
 BOOTSTRAP_FILE='bootstrap-salt.sh'
-BOOTSTRAP_SHA256='b1560cb4e02b604d6d4350384df02f014e8f88d7b615bb607bcad84d014e888d'
+BOOTSTRAP_SHA256='994bf7e8bd92fe6d70d291c7562aff299f5651046b4e76dfa506cee0d9bb0843'
 
 download "${BOOTSTRAP_URL}" "${BOOTSTRAP_FILE}"
 check_sha256 "${BOOTSTRAP_FILE}" "${BOOTSTRAP_SHA256}"

tests/basic/test.sh

@@ -19,7 +19,7 @@ ok "container started"
 # Check salt version
 echo "==> Checking salt-master version ..."
 docker-exec salt-master --versions
-EXPECTED_VERSION="$(cat VERSION)"
+EXPECTED_VERSION="$(cat VERSION) (Sulfur)"
 CURRENT_VERSION="$(docker-exec salt-master --version)"
 check_equal "${CURRENT_VERSION}" "salt-master ${EXPECTED_VERSION%%-*}" "salt-master --version"