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

feat: Fix Jinja2 version to avoid Markup import error

Browse Source
This commit is contained in:
Carlos Álvaro
2022-03-28 23:06:06 +02:00
parent 191b446382
commit 60e44a0aa0
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ for the list of changes in SaltStack.
- Upgrade `salt-master` to `3004.1` *Silicon* - Upgrade `salt-master` to `3004.1` *Silicon*
- Upgrade `pygit2` to version `1.9.1` - Upgrade `pygit2` to version `1.9.1`
- Upgrade `libgit2` to version `1.4.2` - Upgrade `libgit2` to version `1.4.2`
- Fix Jinja2 version to avoid Markup import error
- Change Docker base image to `ubuntu:hirsute-20220113` - Change Docker base image to `ubuntu:hirsute-20220113`
**3004_6** **3004_6**

4
assets/build/install.sh
View File

@@ -72,6 +72,10 @@ 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