Add Ubuntu 22.04 and 24.04 to the packaging custom containers

saltstack · Apr 28, 2024 · c2b62d7 · c2b62d7
1 parent ce55c3d
commit c2b62d7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,8 @@ will be commited.
 - packaging:centosstream-9 - `ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9`
 - packaging:debian-12 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-12`
 - packaging:debian-13 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-13`
+- packaging:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/packaging:ubuntu-22.04`
+- packaging:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/packaging:ubuntu-24.04`
 
 
 ### [![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
@@ -38,6 +38,8 @@ custom:
       - debian-12
       - debian-13
       - centosstream-9
+      - ubuntu-22.04
+      - ubuntu-24.04
 # <---- Custom Containers ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>

diff --git a/custom/packaging/README.md b/custom/packaging/README.md
@@ -3,3 +3,5 @@
 - packaging:centosstream-9 - `ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9`
 - packaging:debian-12 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-12`
 - packaging:debian-13 - `ghcr.io/saltstack/salt-ci-containers/packaging:debian-13`
+- packaging:ubuntu-22.04 - `ghcr.io/saltstack/salt-ci-containers/packaging:ubuntu-22.04`
+- packaging:ubuntu-24.04 - `ghcr.io/saltstack/salt-ci-containers/packaging:ubuntu-24.04`
diff --git a/custom/packaging/ubuntu-22.04.Dockerfile b/custom/packaging/ubuntu-22.04.Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:22.04
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections \
+  && echo 'tzdata tzdata/Zones/Europe select Lisbon' | debconf-set-selections \
+  && DEBIAN_FRONTEND="noninteractive" apt install -y \
+    apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc
diff --git a/custom/packaging/ubuntu-24.04.Dockerfile b/custom/packaging/ubuntu-24.04.Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:22.04
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+
+RUN apt update -y \
+  && echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections \
+  && echo 'tzdata tzdata/Zones/Europe select Lisbon' | debconf-set-selections \
+  && DEBIAN_FRONTEND="noninteractive" apt install -y \
+    apt-utils gnupg jq awscli python3 python3-venv python3-pip \
+    build-essential devscripts debhelper bash-completion git patchelf curl rustc