fix: update to new repos

Author: JacobCoffee

dockerfiles/Dockerfile.focal

@@ -47,8 +47,13 @@ EXPOSE 22
 RUN /usr/sbin/sshd
 
 # Setup Salt Common
-RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/SALT-PROJECT-GPG-PUBKEY-2023.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=$(dpkg --print-architecture)] https://repo.saltproject.io/salt/py3/ubuntu/22.04/$(dpkg --print-architecture)/3006 jammy main" > /etc/apt/sources.list.d/salt.list
+RUN mkdir -p /etc/apt/keyrings
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
+
+# Pin to Salt 3006 LTS
+RUN echo -e "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001" > /etc/apt/preferences.d/salt-pin-1001
+
 RUN apt-get update -y && apt-get install -y --no-install-recommends salt-minion
 
 # Start Systemd (systemctl)

dockerfiles/Dockerfile.jammy

@@ -47,9 +47,13 @@ EXPOSE 22
 RUN /usr/sbin/sshd
 
 # Setup Salt Common
-RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring.gpg https://repo.saltproject.io/salt/py3/ubuntu/24.04/$(dpkg --print-architecture)/SALT-PROJECT-GPG-PUBKEY-2023.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=$(dpkg --print-architecture)] https://repo.saltproject.io/salt/py3/ubuntu/24.04/$(dpkg --print-architecture)/3007 noble main" > /etc/apt/sources.list.d/saltstack.list
-RUN apt-get update -y && apt-get install -y --no-install-recommends salt-minion
+RUN mkdir -p /etc/apt/keyrings
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2023.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
+
+# Pin to Salt 3006 LTS
+RUN echo -e "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001" > /etc/apt/preferences.d/salt-pin-1001
+
 
 # Start Systemd (systemctl)
 CMD ["/lib/systemd/systemd"]