diff --git a/CHANGELOG.md b/CHANGELOG.md index 7edf533..60c9658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ for the list of changes in SaltStack. - Upgrade `salt-master` to `3004.1` *Silicon* - Upgrade `pygit2` to version `1.9.1` - Upgrade `libgit2` to version `1.4.2` +- Fix Jinja2 version to avoid Markup import error - Change Docker base image to `ubuntu:hirsute-20220113` **3004_6** diff --git a/assets/build/install.sh b/assets/build/install.sh index 042448d..fa4f82d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -72,6 +72,10 @@ log_debug "Options: ${SALT_BOOTSTRAP_OPTS[@]}" sh "${BOOTSTRAP_FILE}" ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}" 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 log_info "Configuring ssh ..." sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config