From ee08118269bb196c84177ca7b7bcaf6bc97a207d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 27 Apr 2024 19:03:15 +0100 Subject: [PATCH] Remove Debian 11 from custom packaging and add unreleased Debian 13 We need a newer `rustc` --- README.md | 2 +- containers.yml | 2 +- custom/packaging/README.md | 2 +- custom/packaging/{debian-11.Dockerfile => debian-13.Dockerfile} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename custom/packaging/{debian-11.Dockerfile => debian-13.Dockerfile} (92%) diff --git a/README.md b/README.md index 666025f..c376f48 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,8 @@ will be commited. ### [![Salt Packaging](https://github.com/saltstack/salt-ci-containers/actions/workflows/packaging-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/packaging-containers.yml) - 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` +- packaging:debian-13 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-13` ### [![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 a6be52a..24cf25c 100644 --- a/containers.yml +++ b/containers.yml @@ -35,8 +35,8 @@ custom: Salt Packaging: name: packaging versions: - - debian-11 - debian-12 + - debian-13 - centosstream-9 # <---- Custom Containers --------------------------------------------------------------------------------- diff --git a/custom/packaging/README.md b/custom/packaging/README.md index 8235d88..99a8677 100644 --- a/custom/packaging/README.md +++ b/custom/packaging/README.md @@ -1,5 +1,5 @@ # [![Salt Packaging](https://github.com/saltstack/salt-ci-containers/actions/workflows/packaging-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/packaging-containers.yml) - 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` +- packaging:debian-13 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-13` diff --git a/custom/packaging/debian-11.Dockerfile b/custom/packaging/debian-13.Dockerfile similarity index 92% rename from custom/packaging/debian-11.Dockerfile rename to custom/packaging/debian-13.Dockerfile index 8854e26..8c1d93c 100644 --- a/custom/packaging/debian-11.Dockerfile +++ b/custom/packaging/debian-13.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:11 +FROM debian:trixie COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc