From 8d81951c38e77eea5974abc96f9efa65a68f2c5a Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 3 Jun 2024 22:12:42 +0300
Subject: [PATCH]  Add systemd-ubuntu:24.04/systemd-ubuntu:noble (#24)

---
 .github/workflows/build.yml     | 11 ++++++++++-
 systemd/ubuntu/24.04.Dockerfile | 27 +++++++++++++++++++++++++++
 systemd/ubuntu/README.md        |  3 ++-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 systemd/ubuntu/24.04.Dockerfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de1ad03..64ce478 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -110,7 +110,6 @@ jobs:
             tags: |-
               jrei/systemd-ubuntu:20.04
               jrei/systemd-ubuntu:focal
-              jrei/systemd-ubuntu:latest
           - name: systemd-ubuntu-22.04
             dockerfile: systemd/ubuntu/22.04.Dockerfile
             platforms: |-
@@ -120,6 +119,16 @@ jobs:
             tags: |-
               jrei/systemd-ubuntu:22.04
               jrei/systemd-ubuntu:jammy
+          - name: systemd-ubuntu-24.04
+            dockerfile: systemd/ubuntu/24.04.Dockerfile
+            platforms: |-
+              linux/amd64
+              linux/arm/v7
+              linux/arm64
+            tags: |-
+              jrei/systemd-ubuntu:24.04
+              jrei/systemd-ubuntu:noble
+              jrei/systemd-ubuntu:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/systemd/ubuntu/24.04.Dockerfile b/systemd/ubuntu/24.04.Dockerfile
new file mode 100644
index 0000000..4b1dd72
--- /dev/null
+++ b/systemd/ubuntu/24.04.Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:24.04
+
+ENV container docker
+ENV LC_ALL C
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+    && apt-get install -y systemd systemd-sysv \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN cd /lib/systemd/system/sysinit.target.wants/ \
+    && rm $(ls | grep -v systemd-tmpfiles-setup)
+
+RUN rm -f /lib/systemd/system/multi-user.target.wants/* \
+    /etc/systemd/system/*.wants/* \
+    /lib/systemd/system/local-fs.target.wants/* \
+    /lib/systemd/system/sockets.target.wants/*udev* \
+    /lib/systemd/system/sockets.target.wants/*initctl* \
+    /lib/systemd/system/basic.target.wants/* \
+    /lib/systemd/system/anaconda.target.wants/* \
+    /lib/systemd/system/plymouth* \
+    /lib/systemd/system/systemd-update-utmp*
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/lib/systemd/systemd"]
diff --git a/systemd/ubuntu/README.md b/systemd/ubuntu/README.md
index 5b21e86..86e3f10 100644
--- a/systemd/ubuntu/README.md
+++ b/systemd/ubuntu/README.md
@@ -3,8 +3,9 @@
 You can use this image as a base container to run systemd services inside.
 
 ## Supported tags
+ - `24.04`, `latest`
  - `22.04`
- - `20.04`, `latest`
+ - `20.04`
  - `18.04`
  - `16.04`