From 8b09049dc515842dfec2531d8337c048524cf5e3 Mon Sep 17 00:00:00 2001 From: daniwe4 Date: Mon, 4 Nov 2024 11:44:43 +0100 Subject: [PATCH] master Dockerfiles: update salt urls --- setup/templates/base/Dockerfile | 4 ++-- setup/templates/mail/Dockerfile | 4 ++-- setup/templates/proxy/Dockerfile | 4 ++-- setup/templates/salt/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/templates/base/Dockerfile b/setup/templates/base/Dockerfile index 3da9a3da..bc270852 100755 --- a/setup/templates/base/Dockerfile +++ b/setup/templates/base/Dockerfile @@ -3,8 +3,8 @@ FROM debian:12 RUN apt-get update && apt-get install -y supervisor RUN apt-get update && apt-get install -y cron default-jre apache2 mc vim nano less zip unzip git tree wget ftp curl wkhtmltopdf imagemagick ghostscript npm libapache2-mod-php8.2 php8.2-curl php8.2-gd php-json php8.2-mysql php8.2-readline php8.2-xsl php8.2-cli php8.2-zip php8.2-mbstring php8.2-soap php8.2-bcmath php8.2-imap apt-utils mariadb-server python3-mysqldb python3-dev default-libmysqlclient-dev build-essential pkg-config -RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/latest bookworm main" | tee /etc/apt/sources.list.d/salt.list +RUN curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp +RUN curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources RUN apt-get update && apt-get install -y salt-minion RUN /opt/saltstack/salt/bin/python3 -m pip install --upgrade pip diff --git a/setup/templates/mail/Dockerfile b/setup/templates/mail/Dockerfile index b65f6dda..4db0666d 100755 --- a/setup/templates/mail/Dockerfile +++ b/setup/templates/mail/Dockerfile @@ -4,8 +4,8 @@ FROM debian:12 RUN apt-get update && apt-get install -y supervisor RUN apt-get update && apt-get install -y vim nano curl less virt-what net-tools procps git debconf-utils python3-dev default-libmysqlclient-dev build-essential pkg-config -RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/latest bookworm main" | tee /etc/apt/sources.list.d/salt.list +RUN curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp +RUN curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources RUN apt-get update && apt-get install -y salt-minion RUN /opt/saltstack/salt/bin/python3 -m pip install --upgrade pip diff --git a/setup/templates/proxy/Dockerfile b/setup/templates/proxy/Dockerfile index c223a72d..141f2d41 100755 --- a/setup/templates/proxy/Dockerfile +++ b/setup/templates/proxy/Dockerfile @@ -3,8 +3,8 @@ FROM debian:12 RUN apt-get update && apt-get install -y supervisor RUN apt-get update && apt-get install -y vim nano less virt-what net-tools procps curl -RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/latest bookworm main" | tee /etc/apt/sources.list.d/salt.list +RUN curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp +RUN curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources RUN apt-get update && apt-get install -y salt-minion EXPOSE 80 443 diff --git a/setup/templates/salt/Dockerfile b/setup/templates/salt/Dockerfile index 7eee3b37..c1d40994 100755 --- a/setup/templates/salt/Dockerfile +++ b/setup/templates/salt/Dockerfile @@ -2,8 +2,8 @@ FROM debian:12 RUN apt-get update && apt-get install -y vim nano less virt-what net-tools procps curl -RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/latest bookworm main" | tee /etc/apt/sources.list.d/salt.list +RUN curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | tee /etc/apt/keyrings/salt-archive-keyring.pgp +RUN curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | tee /etc/apt/sources.list.d/salt.sources RUN apt-get update && apt-get install -y salt-master ENTRYPOINT ["salt-master", "-l", "debug"] \ No newline at end of file