From 900f3a85f06d83fd744419fffd996786f8dc74b1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 5 Jul 2023 09:34:36 +0100 Subject: [PATCH] Back to system rust packages. Add Debian 12 to packaging Signed-off-by: Pedro Algarvio --- .github/workflows/packaging-containers.yml | 2 +- README.md | 1 + containers.yml | 1 + custom/packaging/README.md | 1 + custom/packaging/centosstream-9.Dockerfile | 9 +-------- custom/packaging/debian-11.Dockerfile | 9 +-------- custom/packaging/debian-12.Dockerfile | 7 +++++++ 7 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 custom/packaging/debian-12.Dockerfile diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml index 4b5baf3..d3cb481 100644 --- 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 index 476c5cd..aab0680 100644 --- 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 index 4f582a1..633e565 100644 --- 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 index f9c3520..8235d88 100644 --- 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 index 788be2e..9001f8c 100644 --- 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 index 353995d..8854e26 100644 --- 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 new file mode 100644 index 0000000..68127f7 --- /dev/null +++ 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