From cc7deaf061d865c29b39e6ebc77eeb3660dd2b1c Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Thu, 16 Jan 2025 11:55:33 +0000 Subject: [PATCH 1/2] fix: salt install in all-in-one image --- docker/all-in-one/Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docker/all-in-one/Dockerfile b/docker/all-in-one/Dockerfile index d9e5f3fa2..92e033eea 100644 --- a/docker/all-in-one/Dockerfile +++ b/docker/all-in-one/Dockerfile @@ -160,13 +160,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 From fc698d04a69a021f550131cc53e8fc1c3b01b9d8 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Thu, 16 Jan 2025 11:56:45 +0000 Subject: [PATCH 2/2] chore: remove legacy ENV syntax --- docker/all-in-one/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/all-in-one/Dockerfile b/docker/all-in-one/Dockerfile index 92e033eea..ec0c51637 100644 --- a/docker/all-in-one/Dockerfile +++ b/docker/all-in-one/Dockerfile @@ -156,8 +156,8 @@ 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 < /etc/apt/preferences.d/salt-pin-1001