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

Merge pull request #150 from cdalvaro/upgrade/v3004.2

Browse Source 
Upgrade to v3004.2
This commit is contained in:
Carlos D. Álvaro
2022-06-21 21:31:18 +02:00
committed by GitHub
parent 0cb46d9c57 782e8fe77c
commit 911fbd1cab
6 changed files with 13 additions and 12 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. `3004.1`] - Image tag: [e.g. `3004.2`]
**Additional context** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

7
CHANGELOG.md
View File

@@ -1,9 +1,14 @@
# Changelog # Changelog
This file only reflects the changes that are made in this image. This file only reflects the changes that are made in this image.
Please refer to the [Salt 3004.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.1.html) Please refer to the [Salt 3004.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.2.html)
for the list of changes in SaltStack. for the list of changes in SaltStack.
**3004.2**
- Upgrade `salt-master` to `3004.2` *Silicon*
- Remove Jinja2 patch to avoid Markup import error
**3004.1** **3004.1**
- Upgrade `salt-master` to `3004.1` *Silicon* - Upgrade `salt-master` to `3004.1` *Silicon*

2
Dockerfile
View File

@@ -5,7 +5,7 @@ ARG VCS_REF
# https://github.com/saltstack/salt/releases # https://github.com/saltstack/salt/releases
# NOTE: Review org.label-schema.version label if necessary # NOTE: Review org.label-schema.version label if necessary
ENV SALT_VERSION="3004.1" \ ENV SALT_VERSION="3004.2" \
PYTHON_VERSION="3.9" PYTHON_VERSION="3.9"
ENV SALT_DOCKER_DIR="/etc/docker-salt" \ ENV SALT_DOCKER_DIR="/etc/docker-salt" \

8
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 v3004.1 _Silicon_ # Dockerized Salt Master v3004.2 _Silicon_
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.
@@ -46,7 +46,7 @@ For other methods to install `salt-master` please refer to the [Official Salt Pr
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/docker-salt-master/) and is the recommended method of installation. Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/docker-salt-master/) and is the recommended method of installation.
```sh ```sh
docker pull cdalvaro/docker-salt-master:3004.1 docker pull cdalvaro/docker-salt-master:3004.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`
@@ -593,8 +593,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
- 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-v3004.1-lightgrey.svg?logo=Saltstack [saltproject_badge]: https://img.shields.io/badge/Salt-v3004.2-lightgrey.svg?logo=Saltstack
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.1.html "Salt Project Release Notes" [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.2.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-hirsute--20220113-E95420.svg?logo=Ubuntu [ubuntu_badge]: https://img.shields.io/badge/ubuntu-hirsute--20220113-E95420.svg?logo=Ubuntu
[ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
[github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?label=build&logo=GitHub&logoColor=%23181717 [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?label=build&logo=GitHub&logoColor=%23181717

2
VERSION
View File

@@ -1 +1 @@
3004.1 3004.2

4
assets/build/install.sh
View File

@@ -72,10 +72,6 @@ log_debug "Options: ${SALT_BOOTSTRAP_OPTS[@]}"
sh "${BOOTSTRAP_FILE}" ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}" sh "${BOOTSTRAP_FILE}" ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}"
chown -R "${SALT_USER}": "${SALT_ROOT_DIR}" chown -R "${SALT_USER}": "${SALT_ROOT_DIR}"
# Fix Jinja2 version to avoid Markup import error
# https://github.com/saltstack/salt/issues/61848
pip3 install -I markupsafe==2.0.1 jinja2==3.0.3
# Configure ssh # Configure ssh
log_info "Configuring ssh ..." log_info "Configuring ssh ..."
sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config