chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade salt-master to 3005.1-2 Phosphorus

Browse Source
This commit is contained in:
Carlos Álvaro
2022-11-10 15:50:54 +01:00
parent 1fa0971b75
commit 8057041774
8 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@@ -26,7 +26,7 @@ The full log with the outputted error.
**Version report (please complete the following information):** **Version report (please complete the following information):**
- Host OS: [e.g. `uname -a`] - Host OS: [e.g. `uname -a`]
- Docker: [e.g. `docker --version`] - Docker: [e.g. `docker --version`]
- Image tag: [e.g. `3005.1_2`] - Image tag: [e.g. `3005.1-2`]
**Additional context** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

4
.github/workflows/build-and-test.yml vendored
View File

@@ -133,11 +133,13 @@ jobs:
- name: Install and configure salt-minion - name: Install and configure salt-minion
run: | run: |
# Install salt-minion from salt repos # Install salt-minion from salt repos
VERSION=$(cat VERSION)
curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
chmod +x bootstrap-salt.sh 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 stop salt-minion
sudo systemctl disable salt-minion sudo systemctl disable salt-minion
sudo rm -f /var/log/salt/minion
- name: Execute basic tests - name: Execute basic tests
if: always() if: always()

4
CHANGELOG.md
View File

@@ -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) 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. for the list of changes in SaltStack.
**3005.1-2**
- Upgrade `salt-master` to `3005.1-2` *Phosphorus*.
**3005.1_2** **3005.1_2**
- Add support for GPG keys. - Add support for GPG keys.

4
Dockerfile
View File

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

2
Makefile
View File

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

6
README.md
View File

@@ -7,7 +7,7 @@
[![Architecture ARM64][arch_arm64_badge]][arch_link] [![Architecture ARM64][arch_arm64_badge]][arch_link]
[![Architecture ARM/v7][arch_arm_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. 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. the recommended method of installation.
```sh ```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` 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/getstarted/
- https://docs.saltproject.io/en/latest/contents.html - 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" [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"

2
VERSION
View File

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

5
tests/basic/test.sh
View File

@@ -19,8 +19,9 @@ ok "container started"
# Check salt version # Check salt version
echo "==> Checking salt-master version ..." echo "==> Checking salt-master version ..."
docker-exec salt-master --versions docker-exec salt-master --versions
[[ "$(docker-exec salt-master --version)" == "salt-master $(cat VERSION)" ]] || error "salt-master version" EXPECTED_VERSION="$(cat VERSION)"
ok "salt-master version" CURRENT_VERSION="$(docker-exec salt-master --version)"
check_equal "${CURRENT_VERSION}" "salt-master ${EXPECTED_VERSION%%-*}" "salt-master --version"
# Test image calling healthcheck # Test image calling healthcheck
echo "==> Executing healthcheck ..." echo "==> Executing healthcheck ..."