Skip to content

Fix All-in-one image build due to Salt repository changes #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Fix All-in-one image build due to Salt repository changes #1411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7deaf
fix: salt install in all-in-one image
tgallacher Jan 16, 2025
fc698d0
chore: remove legacy ENV syntax
tgallacher Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions docker/all-in-one/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,17 +156,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
####################
# Install salt
####################
ENV DEBIAN_FRONTEND noninteractive
ENV SALT_VERSION 3006
ENV DEBIAN_FRONTEND=noninteractive
ENV SALT_VERSION=3006

# Install one-dir salt
RUN cat <<EOF > /etc/apt/preferences.d/salt-pin-1001
Package: salt-*
Pin: version ${SALT_VERSION}.*
Pin-Priority: 1001
EOF

RUN mkdir /etc/apt/keyrings \
&& curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg https://repo.saltproject.io/salt/py3/ubuntu/20.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg arch=arm64] https://repo.saltproject.io/salt/py3/ubuntu/20.04/arm64/$SALT_VERSION focal main" | tee /etc/apt/sources.list.d/salt.list \
&& curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023-amd.gpg https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023-amd.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/$SALT_VERSION focal main" | tee -a /etc/apt/sources.list.d/salt.list \
&& apt-get clean && apt-get update \
&& apt-get install -y salt-minion
&& curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public \
&& curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources > /etc/apt/sources.list.d/salt.sources \
&& apt-get clean && apt-get update && apt-get install -y salt-minion

ADD docker/all-in-one/etc/salt/minion /etc/salt/minion

Expand Down
Loading