Skip to content

Commit

Permalink
revert(dockerfile.yum): use Amazon stable builds workaround [skip ci]
Browse files Browse the repository at this point in the history
This reverts commits:

* 95e8362
* 4a92088

The workaround is no longer required:

* saltstack/salt#59982 (comment)
  • Loading branch information
myii committed Jun 30, 2021
1 parent f251341 commit ce6568e
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions Dockerfile.yum
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,6 @@ RUN if [[ "${DISTRO_NAME}" = "centos" ]]; then \
fi \
&& yum -y install ${PKGS} \
&& if [ "${SALT_VERSION}" != "tiamat" ]; then \
# Use workaround for Amazon Linux stable builds until packaging resolved (https://github.com/saltstack/salt/issues/59982)
# Update: Issue has been closed but this workaround will be required for all versions < `3003.1`
if [ "${DISTRO_NAME}" = "amazonlinux" ] && [ "${DISTRO_VERSION}" = "2" ] && [ "${SALT_INSTALL_METHOD}" = "stable" ] && [ "${SALT_VERSION}" \< "3003.1" ]; then \
SALT_MAJOR_VERSION=$(echo "${SALT_VERSION}" | cut -d. -f1); \
rpm --import https://repo.saltproject.io/py3/amazon/2/x86_64/${SALT_MAJOR_VERSION}/SALTSTACK-GPG-KEY.pub; \
curl -fsSL https://repo.saltproject.io/py3/amazon/2/x86_64/${SALT_MAJOR_VERSION}.repo | tee /etc/yum.repos.d/saltstack-py3-repo.repo; \
yum clean expire-cache; \
yum -y install yum-versionlock; \
yum versionlock add python3-urllib3-0:1.23-6.amzn2.noarch; \
fi; \
# Install Salt using the bootstrap script (removing the 10 seconds delay to cancel the bootstrap)
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
sed -e '/^\s\+echowarn "You have 10 seconds to cancel and stop the bootstrap process..."/,+2d' | \
Expand Down

0 comments on commit ce6568e

Please sign in to comment.