diff --git a/Vagrantfile b/Vagrantfile index 1337e2a2..74caf5bc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -39,7 +39,7 @@ Vagrant.configure("2") do |config| config.vm.define "salt-master" do |s_config| s_config.vm.provider "docker" do |docker, override| docker.build_dir = "dockerfiles" - docker.dockerfile = "Dockerfile.jammy" + docker.dockerfile = "Dockerfile.noble" end s_config.vm.hostname = "salt-master.vagrant.psf.io" diff --git a/dockerfiles/Dockerfile.noble b/dockerfiles/Dockerfile.noble index 8700fb74..9c878082 100644 --- a/dockerfiles/Dockerfile.noble +++ b/dockerfiles/Dockerfile.noble @@ -52,7 +52,7 @@ RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2024.pgp https://pack RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.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 printf "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001\n" > /etc/apt/preferences.d/salt-pin-1001 +RUN printf "Package: salt-*\nPin: version 3007.*\nPin-Priority: 1001\n" > /etc/apt/preferences.d/salt-pin-1001 # Start Systemd (systemctl) diff --git a/salt/base/salt.sls b/salt/base/salt.sls index 2915045e..125ee115 100644 --- a/salt/base/salt.sls +++ b/salt/base/salt.sls @@ -39,7 +39,7 @@ salt-pin-config: - name: /etc/apt/preferences.d/salt-pin-1001 - contents: | Package: salt-* - Pin: version 3006.* + Pin: version 3007.* Pin-Priority: 1001 - user: root - group: root