From 182500f18389f5b710e0a1bc58a51ad989c33948 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Wed, 15 Jan 2025 16:45:54 +0000 Subject: [PATCH] fix: migrate to new salt apt repo location --- docker/all-in-one/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) mode change 100644 => 100755 docker/all-in-one/Dockerfile diff --git a/docker/all-in-one/Dockerfile b/docker/all-in-one/Dockerfile old mode 100644 new mode 100755 index d9e5f3fa2..9c7f56d9f --- a/docker/all-in-one/Dockerfile +++ b/docker/all-in-one/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1.4 ARG postgres_version=15.1.1.49 ARG pgbouncer_release=1.18.0 @@ -160,13 +161,16 @@ ENV DEBIAN_FRONTEND noninteractive ENV SALT_VERSION 3006 # Install one-dir salt +RUN cat < /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