From a6a12a1a05487630eb7eb5cf75d61d20117e3d42 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 1 Aug 2024 09:20:54 -0700 Subject: [PATCH] Add Ubuntu 24.10 Signed-off-by: Tim Smith --- .github/workflows/main.yaml | 1 + rockylinux-8/Dockerfile | 2 +- rockylinux-9/Dockerfile | 2 +- ubuntu-16.04/Dockerfile | 2 +- ubuntu-18.04/Dockerfile | 2 +- ubuntu-20.04/Dockerfile | 2 +- ubuntu-22.04/Dockerfile | 2 +- ubuntu-24.04/Dockerfile | 2 +- ubuntu-24.10/Dockerfile | 67 +++++++++++++++++++++++++++++++++++++ 9 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 ubuntu-24.10/Dockerfile diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c5481ef..d9c6742 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -44,6 +44,7 @@ jobs: - "ubuntu-20.04" - "ubuntu-22.04" - "ubuntu-24.04" + - "ubuntu-24.10" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/rockylinux-8/Dockerfile b/rockylinux-8/Dockerfile index 6dc6762..5efc139 100644 --- a/rockylinux-8/Dockerfile +++ b/rockylinux-8/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing rockylinux-8" +LABEL org.opencontainers.image.description="A Docker container for testing Rocky Linux 8" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/rockylinux-9/Dockerfile b/rockylinux-9/Dockerfile index 338a2db..a060f7b 100644 --- a/rockylinux-9/Dockerfile +++ b/rockylinux-9/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing rockylinux-9" +LABEL org.opencontainers.image.description="A Docker container for testing Rocky Linux 9" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-16.04/Dockerfile b/ubuntu-16.04/Dockerfile index 9647709..bf8e828 100644 --- a/ubuntu-16.04/Dockerfile +++ b/ubuntu-16.04/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing ubuntu-16.04" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 16.04" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-18.04/Dockerfile b/ubuntu-18.04/Dockerfile index c448daa..d53e372 100644 --- a/ubuntu-18.04/Dockerfile +++ b/ubuntu-18.04/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing ubuntu-18.04" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 18.04" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-20.04/Dockerfile b/ubuntu-20.04/Dockerfile index 1aaccca..4400ace 100644 --- a/ubuntu-20.04/Dockerfile +++ b/ubuntu-20.04/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing ubuntu-20.04" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 20.04" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-22.04/Dockerfile b/ubuntu-22.04/Dockerfile index 3a8dc2e..0c616d8 100644 --- a/ubuntu-22.04/Dockerfile +++ b/ubuntu-22.04/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing ubuntu-22.04" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 22.04" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-24.04/Dockerfile b/ubuntu-24.04/Dockerfile index 6777072..a2f287a 100644 --- a/ubuntu-24.04/Dockerfile +++ b/ubuntu-24.04/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF LABEL org.opencontainers.image.created=$BUILD_DATE LABEL org.opencontainers.image.title="test-kitchen/dokken-images" -LABEL org.opencontainers.image.description="A Docker container for testing ubuntu-24.04" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 24.04" LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" LABEL org.opencontainers.image.revision=$VCS_REF LABEL org.opencontainers.image.vendor="test-kitchen" diff --git a/ubuntu-24.10/Dockerfile b/ubuntu-24.10/Dockerfile new file mode 100644 index 0000000..051b112 --- /dev/null +++ b/ubuntu-24.10/Dockerfile @@ -0,0 +1,67 @@ +FROM ubuntu:24.10 +LABEL maintainer="tim@mondoo.com" +ARG BUILD_DATE +ARG VCS_REF + +LABEL org.opencontainers.image.created=$BUILD_DATE +LABEL org.opencontainers.image.title="test-kitchen/dokken-images" +LABEL org.opencontainers.image.description="A Docker container for testing Ubuntu 24.10" +LABEL org.opencontainers.image.source="https://github.com/test-kitchen/dokken-images" +LABEL org.opencontainers.image.revision=$VCS_REF +LABEL org.opencontainers.image.vendor="test-kitchen" +LABEL org.opencontainers.image.licenses="Apache-2.0" + +ENV DEBIAN_FRONTEND=noninteractive + +# hadolint ignore=DL3008,DL3015 +RUN apt-get update && \ + apt-get -y install \ + apt-transport-https \ + apt-utils \ + curl \ + dbus \ + cron \ + dirmngr \ + dmidecode \ + gnupg \ + iproute2 \ + iptables \ + iputils-ping \ + kmod \ + less \ + linux-base \ + locales \ + lsb-release \ + lsof \ + net-tools \ + nmap \ + perl \ + procps \ + snapd \ + strace \ + sudo \ + systemd \ + tcpdump \ + telnet \ + tzdata \ + udev \ + vim-tiny \ + wget && \ + apt-get clean && \ + apt-get -y autoremove && \ + rm -rf /tmp/* /var/tmp/* && \ + find /etc/systemd/system \ + /lib/systemd/system \ + -path '*.wants/*' \ + \( -name '*getty*' \ + -or -name '*apt-daily*' \ + -or -name '*systemd-timesyncd*' \ + -or -name '*systemd-logind*' \ + -or -name '*systemd-vconsole-setup*' \ + -or -name '*systemd-readahead*' \ + -or -name '*udev*' \) \ + -exec rm -v {} \; && \ + systemctl set-default multi-user.target && \ + systemctl mask dev-hugepages.mount sys-fs-fuse-connections.mount network.service + +CMD [ "/bin/systemd" ]