Back to system rust packages. Add Debian 12 to packaging

Signed-off-by: Pedro Algarvio <[email protected]>
saltstack · Jul 5, 2023 · 900f3a8 · 900f3a8
1 parent f166d3e
commit 900f3a8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
@@ -119,7 +119,7 @@ jobs:
 
       - name: Inspect Source Image
         run: |
-          docker buildx imagetools inspect debian:11 | tee -a source-container-inspect.txt
+          docker buildx imagetools inspect debian:12 | tee -a source-container-inspect.txt
 
       - name: Define Build Platforms
         id: define-platforms

diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ will be commited.
 
 - packaging:centosstream-9 - `ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9`
 - packaging:debian-11 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-11`
+- packaging:debian-12 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-12`
 
 
 ### [![Virt Minion](https://github.com/saltstack/salt-ci-containers/actions/workflows/virt-minion-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/virt-minion-containers.yml)

diff --git a/containers.yml b/containers.yml
@@ -36,6 +36,7 @@ custom:
     name: packaging
     versions:
       - debian-11
+      - debian-12
       - centosstream-9
     exclude_platforms:
       - linux/386

diff --git a/custom/packaging/README.md b/custom/packaging/README.md
@@ -2,3 +2,4 @@
 
 - packaging:centosstream-9 - `ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9`
 - packaging:debian-11 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-11`
+- packaging:debian-12 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-12`
diff --git a/custom/packaging/centosstream-9.Dockerfile b/custom/packaging/centosstream-9.Dockerfile
@@ -2,14 +2,7 @@ FROM quay.io/centos/centos:stream9
 
 RUN yum update -y \
   && yum install -y python3 python3-devel python3-pip openssl git rpmdevtools rpmlint \
-    systemd-units libxcrypt-compat git gnupg2 jq createrepo rpm-sign epel-release \
+    systemd-units libxcrypt-compat git gnupg2 jq createrepo rpm-sign epel-release rustc cargo \
   && yum install -y patchelf \
   && yum install -y --allowerasing curl \
   && python3 -m pip install awscli
-
-RUN export RUSTUP_HOME=/opt/rust \
-  && export CARGO_HOME=/opt/rust \
-  && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path
-
-RUN for fname in $(ls /opt/rust/bin); do echo -e '#!/bin/sh\n\nRUSTUP_HOME=/opt/rust exec /opt/rust/bin/${0##*/} "$@"' > /usr/bin/$fname; chmod +x /usr/bin/$fname; done \
-  && rustc --version
diff --git a/custom/packaging/debian-11.Dockerfile b/custom/packaging/debian-11.Dockerfile
@@ -4,11 +4,4 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt update -y \
   && apt install -y apt-utils gnupg jq awscli python3 python3-venv python3-pip \
-    build-essential devscripts debhelper bash-completion git patchelf curl
-
-RUN export RUSTUP_HOME=/opt/rust \
-  && export CARGO_HOME=/opt/rust \
-  && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path
-
-RUN for fname in $(ls /opt/rust/bin); do echo -e '#!/bin/sh\n\nRUSTUP_HOME=/opt/rust exec /opt/rust/bin/${0##*/} "$@"' > /usr/bin/$fname; chmod +x /usr/bin/$fname; done \
-  && rustc --version
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc
diff --git a/custom/packaging/debian-12.Dockerfile b/custom/packaging/debian-12.Dockerfile
@@ -0,0 +1,7 @@
+FROM debian:12
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && apt install -y apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc