Skip to content

Commit

Permalink
feat(dockerfile.yum): update workaround for Amazon Linux stable builds
Browse files Browse the repository at this point in the history
Still required for Salt versions that are less than `3003.1`:

* saltstack/salt#59982
  • Loading branch information
myii committed Jun 23, 2021
1 parent a9a2df2 commit 4a92088
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Dockerfile.yum
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ RUN if [[ "${DISTRO_NAME}" = "centos" ]]; then \
&& 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)
if [ "${DISTRO_NAME}" = "amazonlinux" ] && [ "${DISTRO_VERSION}" = "2" ] && [ "${SALT_INSTALL_METHOD}" = "stable" ]; then \
# 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; \
Expand Down

0 comments on commit 4a92088

Please sign in to comment.