Skip to content

Commit

Permalink
feat(master): use Jinja2 downgrade workaround (3.0.x => 2.11.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed May 19, 2021
1 parent a1d8e08 commit 2899000
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Dockerfile.apt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.dnf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.emg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.pac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.yum
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.zyp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2899000

Please sign in to comment.