Upgrade salt-master to 3006.2 Sulfur

This commit is contained in:
Carlos Álvaro
2023-08-10 21:31:53 +02:00
committed by Carlos D. Álvaro
parent d896072eac
commit e238a5a4ad
6 changed files with 17 additions and 12 deletions

View File

@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Minimum salt configuration file
2. Minimum salt state to reproduce the error
3. Additional required files to reproduce the error
@@ -25,9 +26,9 @@ 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. `3006.1_1`]
- Host OS: [e.g. `uname -a`]
- Docker: [e.g. `docker --version`]
- Image tag: [e.g. `3006.2`]
**Additional context**
Add any other context about the problem here.

View File

@@ -1,9 +1,13 @@
# Changelog
This file only reflects the changes that are made in this image.
Please refer to the [Salt 3006.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.1.html)
Please refer to the [Salt 3006.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3006.2.html)
for the list of changes in SaltStack.
**3006.2**
- Upgrade `salt-master` to `3006.2` *Sulfur*.
**3006.1_1**
- Stream `salt-master` output to stdout and stderr.

View File

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

View File

@@ -18,7 +18,7 @@ build:
release: build
@docker tag cdalvaro/docker-salt-master:latest \
cdalvaro/docker-salt-master:$(shell cat VERSION)_1
cdalvaro/docker-salt-master:$(shell cat VERSION)
quickstart:
@echo "Starting docker-salt-master container..."

View File

@@ -6,7 +6,7 @@
[![Architecture AMD64][arch_amd64_badge]][arch_link]
[![Architecture ARM64][arch_arm64_badge]][arch_link]
# Dockerized Salt Master v3006.1 _Sulfur_
# Dockerized Salt Master v3006.2 _Sulfur_
Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform.
@@ -23,7 +23,7 @@ Automated builds of the image are available on
the recommended method of installation.
```sh
docker pull ghcr.io/cdalvaro/docker-salt-master:3006.1
docker pull ghcr.io/cdalvaro/docker-salt-master:3006.2
```
You can also pull the latest tag which is built from the repository `HEAD`
@@ -786,9 +786,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-v3006.1-lightgrey.svg?logo=Saltstack
[saltproject_badge]: https://img.shields.io/badge/Salt-v3006.2-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.1.html "Salt Project Release Notes"
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3006.2.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20230425-E95420.svg?logo=Ubuntu

View File

@@ -1 +1 @@
3006.1
3006.2