diff --git a/Dockerfile.apt b/Dockerfile.apt index a717307..0737ad3 100644 --- a/Dockerfile.apt +++ b/Dockerfile.apt @@ -41,6 +41,11 @@ RUN apt-get update \ apt-get update; \ apt-get install --yes --no-install-recommends salt-minion; \ fi \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ # Disable salt's service as we don't need it running && systemctl disable salt-minion.service > /dev/null 2>&1 \ # Remove unnecessary getty and udev targets that result in high CPU usage when using diff --git a/Dockerfile.dnf b/Dockerfile.dnf index 521b982..fd461e7 100644 --- a/Dockerfile.dnf +++ b/Dockerfile.dnf @@ -23,6 +23,11 @@ SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"] RUN dnf -y update && dnf -y install ${PKGS} --setopt=install_weak_deps=False && dnf clean all \ && curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \ sh -s -- -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ && systemctl disable salt-minion.service > /dev/null 2>&1 \ # Use the `LEGACY` crypto policy since Kitchen testing currently relies on # this keypair type (make the SSH policy in Fedora 33+ behave like Fedora 32) diff --git a/Dockerfile.emg b/Dockerfile.emg index 7ba5145..1b29cf7 100644 --- a/Dockerfile.emg +++ b/Dockerfile.emg @@ -37,6 +37,11 @@ RUN mkdir --parents /etc/portage/repos.conf \ && emerge --noreplace --quiet --with-bdeps-auto=n ${PKGS} \ && curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \ sh -s -- -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ # Generate locales && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen \ # Enable sshd and disable salt's service as we don't need it running diff --git a/Dockerfile.pac b/Dockerfile.pac index dd38d9d..1dd5c42 100644 --- a/Dockerfile.pac +++ b/Dockerfile.pac @@ -24,6 +24,11 @@ RUN pacman --noconfirm -Sy archlinux-keyring \ && pacman --noconfirm -Syu ${PKGS} \ && curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \ sh -s -- -XUdfPD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ && systemctl enable sshd \ && systemctl disable salt-minion.service > /dev/null 2>&1 \ # Remove unnecessary getty and udev targets that result in high CPU usage when using diff --git a/Dockerfile.yum b/Dockerfile.yum index d987536..262a409 100644 --- a/Dockerfile.yum +++ b/Dockerfile.yum @@ -69,6 +69,11 @@ RUN if [[ "${DISTRO_NAME}" = "centos" ]]; then \ yum clean expire-cache; \ yum -y install salt-minion; \ fi \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ && if command -v systemctl; then \ systemctl disable salt-minion.service > /dev/null 2>&1; \ elif [ -f "/etc/init.d/salt-minion" ]; then \ diff --git a/Dockerfile.zyp b/Dockerfile.zyp index 68227c7..f76eaaa 100644 --- a/Dockerfile.zyp +++ b/Dockerfile.zyp @@ -35,6 +35,11 @@ RUN zypper refresh && zypper install --no-recommends -y ${PKGS} && zypper clean # https://github.com/saltstack/salt-bootstrap/blob/4310738bc4cf3b89b2873c0d66f71cbf0888edff/bootstrap-salt.sh#L323-L325 && curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \ sh -s -- -XUdfPwD -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \ + # Use temporary workaround of downgrading Jinja2 for `master` image builds + # See https://github.com/saltstack/salt/issues/60188 + && if [ "${SALT_VERSION}" = "master" ]; then \ + pip3 install --no-cache-dir Jinja2==2.11.3; \ + fi \ && systemctl disable salt-minion.service > /dev/null 2>&1 \ # Remove unnecessary getty and udev targets that result in high CPU usage when using # multiple containers with Molecule or Kitchen (https://github.com/ansible/molecule/issues/1104)