Skip to content

Commit

Permalink
fix: migrate to new salt apt repo location
Browse files Browse the repository at this point in the history
  • Loading branch information
tgallacher committed Jan 16, 2025
1 parent c9b0eb5 commit 182500f
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions docker/all-in-one/Dockerfile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.4
ARG postgres_version=15.1.1.49

ARG pgbouncer_release=1.18.0
Expand Down Expand Up @@ -160,13 +161,16 @@ 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

0 comments on commit 182500f

Please sign in to comment.