wip

Author: tgallacher

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,18 @@ 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 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 -o /etc/apt/sources.list.d/salt.list https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources \
+    && <<EOF /usr/bin/env bash
+    echo "Package: salt-*" > /etc/apt/preferences.d/salt-pin-1001
+    echo "Pin: version \${SALT_VERSION}.*" >> /etc/apt/preferences.d/salt-pin-1001
+    echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001
+    EOF \
+    && apt-get clean && apt-get update && apt-get install -y salt-minion
 
 ADD docker/all-in-one/etc/salt/minion /etc/salt/minion