feat: Upgrade salt-master to 3007.1 Chlorine

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: ""
 labels: bug
 assignees: cdalvaro
-
 ---
 
 **Describe the bug**
@@ -28,7 +27,7 @@ The full log with the outputted error.
 
 - Host OS: [e.g. `uname -a`]
 - Docker: [e.g. `docker --version`]
-- Image tag: [e.g. `3007.0_2`]
+- Image tag: [e.g. `3007.1`]
 
 **Additional context**
 Add any other context about the problem here.

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
 This file only reflects the changes that are made in this image.
-Please refer to the [Salt 3007.0 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3007.0.html)
+Please refer to the [Salt 3007.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3007.1.html)
 for the list of changes in SaltStack.
 
+**3007.1**
+
+- Upgrade `salt-master` to `3007.1` _Chlorine_.
+
 **3007.0_2**
 
 - Rename `SALT_API_SERVICE_ENABLED` to `SALT_API_ENABLED`.
@@ -17,7 +21,7 @@ for the list of changes in SaltStack.
 
 **3007.0**
 
-- Upgrade `salt-master` to `3007.0` *Chlorine*.
+- Upgrade `salt-master` to `3007.0` _Chlorine_.
 - Change Docker base image to `ubuntu:jammy-20240227`.
 
 **3006.7_1**
@@ -26,13 +30,13 @@ for the list of changes in SaltStack.
 
 **3006.7**
 
-- Upgrade `salt-master` to `3006.7` *Sulfur*.
+- Upgrade `salt-master` to `3006.7` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20240212`.
 - Update `pygit2` to version `1.14.1`.
 
 **3006.6**
 
-- Upgrade `salt-master` to `3006.6` *Sulfur*.
+- Upgrade `salt-master` to `3006.6` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20240111`.
 - Update `pygit2` to version `1.14.0`.
 
@@ -42,13 +46,13 @@ for the list of changes in SaltStack.
 
 **3006.5**
 
-- Upgrade `salt-master` to `3006.5` *Sulfur*.
+- Upgrade `salt-master` to `3006.5` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20231211.1`.
 - Update `pygit2` to version `1.13.3`.
 
 **3006.4**
 
-- Upgrade `salt-master` to `3006.4` *Sulfur*.
+- Upgrade `salt-master` to `3006.4` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20231004`.
 - Upgrade `pygit2` to version `1.13.1`.
 
@@ -58,13 +62,13 @@ for the list of changes in SaltStack.
 
 **3006.3**
 
-- Upgrade `salt-master` to `3006.3` *Sulfur*.
+- Upgrade `salt-master` to `3006.3` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20230816`.
 - Upgrade `pygit2` to version `1.12.2`.
 
 **3006.2**
 
-- Upgrade `salt-master` to `3006.2` *Sulfur*.
+- Upgrade `salt-master` to `3006.2` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20230624`.
 
 **3006.1_1**
@@ -76,12 +80,12 @@ for the list of changes in SaltStack.
 
 **3006.1**
 
-- Upgrade `salt-master` to `3006.1` *Sulfur*.
+- Upgrade `salt-master` to `3006.1` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20230425`.
 
 **3006.0**
 
-- Upgrade `salt-master` to `3006.0` *Sulfur*.
+- Upgrade `salt-master` to `3006.0` _Sulfur_.
 - Change Docker base image to `ubuntu:jammy-20230308`.
 - Use [_onedir_](https://docs.saltproject.io/en/latest/topics/releases/3006.0.html#onedir-packaging) system for installing salt.
 - Remove support for arm32 architecture.
@@ -92,7 +96,7 @@ for the list of changes in SaltStack.
 
 **3005.1-2**
 
-- Upgrade `salt-master` to `3005.1-2` *Phosphorus*.
+- Upgrade `salt-master` to `3005.1-2` _Phosphorus_.
 
 **3005.1_2**
 
@@ -119,7 +123,7 @@ for the list of changes in SaltStack.
 
 **3005.1**
 
-- Upgrade `salt-master` to `3005.1` *Phosphorus*.
+- Upgrade `salt-master` to `3005.1` _Phosphorus_.
 - Upgrade `salt-bootstrap` to version `2022.10.04`.
 - Change Docker base image to `ubuntu:jammy-20220815`.
 
@@ -136,7 +140,7 @@ for the list of changes in SaltStack.
 
 **3005**
 
-- Upgrade `salt-master` to `3005` *Phosphorus*.
+- Upgrade `salt-master` to `3005` _Phosphorus_.
 - Upgrade `salt-bootstrap` to version `2022.08.13`.
 - Change Docker base image to `ubuntu:jammy-20220801`.
 - Use `python3` default distro version.
@@ -146,12 +150,12 @@ for the list of changes in SaltStack.
 
 **3004.2**
 
-- Upgrade `salt-master` to `3004.2` *Silicon*.
+- Upgrade `salt-master` to `3004.2` _Silicon_.
 - Remove Jinja2 patch to avoid Markup import error.
 
 **3004.1**
 
-- Upgrade `salt-master` to `3004.1` *Silicon*.
+- Upgrade `salt-master` to `3004.1` _Silicon_.
 - Upgrade `salt-bootstrap` to version `2022.03.15`.
 - Upgrade `pygit2` to version `1.9.1`.
 - Upgrade `libgit2` to version `1.4.2`.
@@ -192,75 +196,75 @@ Support for the `USERMAP_UID` and `USERMAP_GID` env variables will be removed wi
 
 **3004**
 
-- Upgrade `salt-master` to `3004` *Silicon*.
+- Upgrade `salt-master` to `3004` _Silicon_.
 - Change Docker base image to `ubuntu:focal-20211006`.
 
 **3003.3**
 
-- Upgrade `salt-master` to `3003.3` *Aluminium*.
+- Upgrade `salt-master` to `3003.3` _Aluminium_.
 - Change Docker base image to `ubuntu:focal-20210827`.
 
 **3003.2**
 
-- Upgrade `salt-master` to `3003.2` *Aluminium*.
+- Upgrade `salt-master` to `3003.2` _Aluminium_.
 - Change Docker base image to `ubuntu:focal-20210723`.
 
 **3003.1**
 
-- Upgrade `salt-master` to `3003.1` *Aluminium*.
+- Upgrade `salt-master` to `3003.1` _Aluminium_.
 - Change Docker base image to `ubuntu:focal-20210609`.
 
 **3003**
 
-- Upgrade `salt-master` to `3003` *Aluminium*.
+- Upgrade `salt-master` to `3003` _Aluminium_.
 - Add python3 `timelib` `0.2.5`.
 - Change Docker base image to `ubuntu:focal-20210325`.
 - Replace `m2crypto` by `pycryptodome` (see [saltstack/salt#56625](https://github.com/saltstack/salt/pull/56625)).
 
 **3002.6**
 
-- Upgrade `salt-master` to `3002.6` *Magnesium*.
+- Upgrade `salt-master` to `3002.6` _Magnesium_.
 
 **3002.5**
 
-- Upgrade `salt-master` to `3002.5` *Magnesium*.
+- Upgrade `salt-master` to `3002.5` _Magnesium_.
 
 **3002.4**
 
-- Upgrade `salt-master` to `3002.4` *Magnesium*.
+- Upgrade `salt-master` to `3002.4` _Magnesium_.
 
 **3002.3**
 
-- Upgrade `salt-master` to `3002.3` *Magnesium*.
+- Upgrade `salt-master` to `3002.3` _Magnesium_.
 
 **3002.2**
 
-- Upgrade `salt-master` to `3002.2` *Magnesium*.
+- Upgrade `salt-master` to `3002.2` _Magnesium_.
 
 **3002.1**
 
-- Upgrade `salt-master` to `3002.1` *Magnesium*.
+- Upgrade `salt-master` to `3002.1` _Magnesium_.
 - Change Docker base image to `ubuntu:focal-20201008`.
 - Fix issue changing _read-only_ directories ownership.
   ([@Kidswiss](https://github.com/Kidswiss) - [#47](https://github.com/cdalvaro/docker-salt-master/pull/47))
 
 **3002**
 
-- Upgrade `salt-master` to `3002` *Magnesium*.
+- Upgrade `salt-master` to `3002` _Magnesium_.
 - Bring back support for Linux ARMv7 platform.
 - Remove patch for muting sudo `RLIMIT_CORE` message.
 - Install `pygit2` and `m2crypto` from ubuntu repositories.
 - Change Docker base image to `ubuntu:focal-20200925`.
 
 **3001.1**
 
-- Upgrade `salt-master` to `3001.1` *Sodium*.
+- Upgrade `salt-master` to `3001.1` _Sodium_.
 - Upgrade `m2crypto` to version `0.36.0`.
 - Change Docker base image to `ubuntu:focal-20200720`.
 
 **3001**
 
-- Upgrade `salt-master` to `3001` *Sodium*.
+- Upgrade `salt-master` to `3001` _Sodium_.
 - Upgrade Python to version `3.8`.
 - Upgrade `libgit2` to version `1.0.1`.
 - Change Docker base image to `ubuntu:focal-20200606`.
@@ -302,7 +306,7 @@ Support for the `USERMAP_UID` and `USERMAP_GID` env variables will be removed wi
 
 **3000**
 
-- Upgrade `salt-master` to `3000` *Neon*.
+- Upgrade `salt-master` to `3000` _Neon_.
 - Change Docker base image to `ubuntu:bionic-20200112`.
 - Upgrade pygit2 to version `1.0.3`.
 

Dockerfile

@@ -4,8 +4,8 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3007.0"
-ENV IMAGE_REVISION="_2"
+ENV SALT_VERSION="3007.1"
+ENV IMAGE_REVISION=
 ENV IMAGE_VERSION="${SALT_VERSION}${IMAGE_REVISION}"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
@@ -30,14 +30,14 @@ WORKDIR ${SALT_BUILD_DIR}
 # Install packages
 # hadolint ignore=DL3008
 RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \
     sudo ca-certificates apt-transport-https wget locales openssh-client gpg gpg-agent \
     supervisor logrotate git gettext-base tzdata inotify-tools psmisc \
- && DEBIAN_FRONTEND=noninteractive update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
+    && DEBIAN_FRONTEND=noninteractive update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
     locale-gen en_US.UTF-8 \
     dpkg-reconfigure locales \
- && DEBIAN_FRONTEND=noninteractive apt-get clean --yes \
- && rm -rf /var/lib/apt/lists/*
+    && DEBIAN_FRONTEND=noninteractive apt-get clean --yes \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install saltstack
 COPY assets/build ${SALT_BUILD_DIR}

README.md

@@ -1,4 +1,4 @@
-# Dockerized Salt Master v3007.0 _Chlorine_
+# Dockerized Salt Master v3007.1 _Chlorine_
 
 ![Banner](/social/docker-salt-master-social.jpg)
 
@@ -28,7 +28,7 @@ Automated builds of the image are available on
 the recommended method of installation.
 
 ```sh
-docker pull ghcr.io/cdalvaro/docker-salt-master:3007.0_2
+docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1
 ```
 
 You can also pull the `latest` tag, which is built from the repository `HEAD`
@@ -881,8 +881,8 @@ 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-v3007.0-lightgrey.svg?logo=Saltstack
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3007.0.html "Salt Project Release Notes"
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3007.1-lightgrey.svg?logo=Saltstack
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3007.1.html "Salt Project Release Notes"
 [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20240227-E95420.svg?logo=Ubuntu
 [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
 [docker_size_badge]: https://img.shields.io/docker/image-size/cdalvaro/docker-salt-master/latest?logo=docker&color=2496ED

VERSION

@@ -1 +1 @@
-3007.0
+3007.1

docs/es-ES/README.md

@@ -1,4 +1,4 @@
-# Salt Master v3007.0 _Chlorine_ Contenerizado
+# Salt Master v3007.1 _Chlorine_ Contenerizado
 
 ![Banner](/social/docker-salt-master-social.jpg)
 
@@ -25,7 +25,7 @@ Para otros métodos de instalación de `salt-master`, por favor consulta la [gu
 Todas las imágenes están disponibles en el [Registro de Contenedores de GitHub](https://github.com/cdalvaro/docker-salt-master/pkgs/container/docker-salt-master) y es el método recomendado para la instalación.
 
 ```sh
-docker pull ghcr.io/cdalvaro/docker-salt-master:3007.0_2
+docker pull ghcr.io/cdalvaro/docker-salt-master:3007.1
 ```
 
 También puedes obtener la imagen `latest`, que se construye a partir del repositorio `HEAD`.
@@ -816,8 +816,8 @@ Muchas gracias:
 - https://docs.saltproject.io/en/getstarted/
 - https://docs.saltproject.io/en/latest/contents.html
 
-[saltproject_badge]: https://img.shields.io/badge/Salt-v3007.0-lightgrey.svg?logo=Saltstack
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3007.0.html "Salt Project Release Notes"
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3007.1-lightgrey.svg?logo=Saltstack
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3007.1.html "Salt Project Release Notes"
 [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20240227-E95420.svg?logo=Ubuntu
 [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
 [docker_size_badge]: https://img.shields.io/docker/image-size/cdalvaro/docker-salt-master/latest?logo=docker&color=2496ED