From a1c2ca553cc70f81db60310ee5b7b02b24883fd0 Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Wed, 15 Jan 2025 17:30:27 +0000 Subject: [PATCH] wip --- docker/all-in-one/Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/docker/all-in-one/Dockerfile b/docker/all-in-one/Dockerfile index 37ec8a7ec..3ea41e50f 100755 --- 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 @@ -157,15 +158,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # Install salt #################### ENV DEBIAN_FRONTEND noninteractive +ENV SALT_VERSION 3006 # Install one-dir salt -RUN apt-get clean && apt-get update apt-get install-y apt-transport-https \ - && mkdir /etc/apt/keyrings \ - && curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public \ - && echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg arch=arm64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" | tee /etc/apt/sources.list.d/salt.list \ - && curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public \ - && echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023-arm.gpg arch=amd64] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" | tee -a /etc/apt/sources.list.d/salt.list \ - && apt-get install -y salt-minion +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.gpg 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.list \ + && cat /etc/apt/sources.list.d/salt.list \ + && apt-get clean && apt-get update && apt-get install -y salt-minion ADD docker/all-in-one/etc/salt/minion /etc/salt/minion