Merge pull request #161 from cdalvaro/upgrade/v3005.1

Upgrade to v3005.1 Phosphorus

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

CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
 This file only reflects the changes that are made in this image.
-Please refer to the [Salt 3005 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.html)
+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**
+
+- Upgrade `salt-master` to `3005.1` *Phosphorus*
+- Upgrade `salt-bootstrap` to version `2022.10.04`
+- Change Docker base image to `ubuntu:jammy-20220815`
+
 **3005_1**
 
 - Add support for setting the `salt-master` keys via Docker secrets using the environment variables:

Dockerfile

@@ -1,11 +1,11 @@
-FROM ubuntu:jammy-20220801
+FROM ubuntu:jammy-20220815
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3005"
-ENV IMAGE_VERSION="${SALT_VERSION}_1"
+ENV SALT_VERSION="3005.1"
+ENV IMAGE_VERSION="${SALT_VERSION}"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
     SALT_ROOT_DIR="/etc/salt" \
@@ -72,7 +72,7 @@ LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${IMAGE_VERSION}"
 LABEL org.opencontainers.image.revision="${VCS_REF}"
 LABEL org.opencontainers.image.base.digest="sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f"
-LABEL org.opencontainers.image.base.name="ubuntu:jammy-20220801"
+LABEL org.opencontainers.image.base.name="ubuntu:jammy-20220815"
 LABEL org.opencontainers.image.licenses="MIT"
 
 WORKDIR ${SALT_HOME}

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 _Phosphorus_
+# Dockerized Salt Master v3005.1 _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
+docker pull ghcr.io/cdalvaro/docker-salt-master:3005.1
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -717,11 +717,11 @@ 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-lightgrey.svg?logo=Saltstack
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3005.1-lightgrey.svg?logo=Saltstack
 
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.html "Salt Project Release Notes"
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"
 
-[ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20220801-E95420.svg?logo=Ubuntu
+[ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20220815-E95420.svg?logo=Ubuntu
 
 [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
 

VERSION

@@ -1 +1 @@
-3005
+3005.1

assets/build/install.sh

@@ -38,10 +38,10 @@ install_pkgs --quiet \
   python3-pygit2
 
 # Downloading bootstrap-salt.sh script
-BOOTSTRAP_VERSION='2022.08.13'
+BOOTSTRAP_VERSION='2022.10.04'
 BOOTSTRAP_URL="https://raw.githubusercontent.com/saltstack/salt-bootstrap/v${BOOTSTRAP_VERSION}/bootstrap-salt.sh"
 BOOTSTRAP_FILE='bootstrap-salt.sh'
-BOOTSTRAP_SHA256='8363e4dc2410c6d540fabab972ffc612b04bf4b5239e2ffb3e366266d9b63b70'
+BOOTSTRAP_SHA256='b1560cb4e02b604d6d4350384df02f014e8f88d7b615bb607bcad84d014e888d'
 
 download "${BOOTSTRAP_URL}" "${BOOTSTRAP_FILE}"
 check_sha256 "${BOOTSTRAP_FILE}" "${BOOTSTRAP_SHA256}"