From 552c3af9106985673d044da00fb1758247d47b0b Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 27 Jun 2023 21:00:13 -0700 Subject: [PATCH] Replace Fedora 36 (EOL) with Fedora 39 (#97) New OS time Signed-off-by: Tim Smith --- .github/workflows/main.yaml | 2 +- fedora-36/Dockerfile | 67 ------------------------------------ fedora-37/Dockerfile | 2 +- fedora-38/Dockerfile | 2 +- fedora-39/Dockerfile | 68 +++++++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 70 deletions(-) delete mode 100644 fedora-36/Dockerfile create mode 100644 fedora-39/Dockerfile diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e0e3672..097c99b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -27,9 +27,9 @@ jobs: - "eurolinux-7" - "eurolinux-8" - "eurolinux-9" - - "fedora-36" - "fedora-37" - "fedora-38" + - "fedora-39" - "fedora-latest" - "opensuse-leap-15" - "opensuse-leap-15.3" diff --git a/fedora-36/Dockerfile b/fedora-36/Dockerfile deleted file mode 100644 index 18ae084..0000000 --- a/fedora-36/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM fedora:36 -LABEL maintainer="tim@mondoo.com" -ARG BUILD_DATE -ARG VCS_REF - -LABEL org.label-schema.schema-version="1.0" -LABEL org.label-schema.build-date=$BUILD_DATE -LABEL org.label-schema.name="test-kitchen/dokken-images" -LABEL org.label-schema.description="A Docker container for testing fedora-36" -LABEL org.label-schema.vcs-url="https://github.com/test-kitchen/dokken-images" -LABEL org.label-schema.vcs-ref=$VCS_REF -LABEL org.label-schema.vendor="test-kitchen" - -# hadolint ignore=DL3041 -RUN dnf -y install \ - binutils \ - ca-certificates \ - cronie \ - curl \ - dmidecode \ - ethtool \ - file \ - fipscheck \ - gnupg2 \ - hostname \ - initscripts \ - iproute \ - iptables \ - iputils \ - less \ - lsof \ - nc \ - net-tools \ - nmap \ - openssl \ - passwd \ - procps \ - strace \ - sudo \ - systemd-sysv \ - systemd-udev \ - tcpdump \ - telnet \ - util-linux \ - vim-minimal \ - wget \ - libxcrypt-compat \ - which && \ - dnf upgrade -y && \ - dnf clean all && \ - rm -rf /var/log/* && \ - # Don't start any optional services. - find /etc/systemd/system \ - /lib/systemd/system \ - -path '*.wants/*' \ - \( -name '*getty*' \ - -or -name '*systemd-logind*' \ - -or -name '*systemd-vconsole-setup*' \ - -or -name '*systemd-readahead*' \ - -or -name '*kdump*' \ - -or -name '*dnf-makecache*' \ - -or -name '*udev*' \) \ - -exec rm -v {} \; && \ - systemctl set-default multi-user.target && \ - systemctl mask dev-hugepages.mount sys-fs-fuse-connections.mount network.service systemd-journal-flush.service - -CMD [ "/usr/lib/systemd/systemd" ] diff --git a/fedora-37/Dockerfile b/fedora-37/Dockerfile index 9839aaf..b4f3606 100644 --- a/fedora-37/Dockerfile +++ b/fedora-37/Dockerfile @@ -6,7 +6,7 @@ ARG VCS_REF LABEL org.label-schema.schema-version="1.0" LABEL org.label-schema.build-date=$BUILD_DATE LABEL org.label-schema.name="test-kitchen/dokken-images" -LABEL org.label-schema.description="A Docker container for testing fedora-37" +LABEL org.label-schema.description="A Docker container for testing Fedora 37" LABEL org.label-schema.vcs-url="https://github.com/test-kitchen/dokken-images" LABEL org.label-schema.vcs-ref=$VCS_REF LABEL org.label-schema.vendor="test-kitchen" diff --git a/fedora-38/Dockerfile b/fedora-38/Dockerfile index 09b9614..99dad7b 100644 --- a/fedora-38/Dockerfile +++ b/fedora-38/Dockerfile @@ -6,7 +6,7 @@ ARG VCS_REF LABEL org.label-schema.schema-version="1.0" LABEL org.label-schema.build-date=$BUILD_DATE LABEL org.label-schema.name="test-kitchen/dokken-images" -LABEL org.label-schema.description="A Docker container for testing fedora-38" +LABEL org.label-schema.description="A Docker container for testing Fedora 38" LABEL org.label-schema.vcs-url="https://github.com/test-kitchen/dokken-images" LABEL org.label-schema.vcs-ref=$VCS_REF LABEL org.label-schema.vendor="test-kitchen" diff --git a/fedora-39/Dockerfile b/fedora-39/Dockerfile new file mode 100644 index 0000000..1bf7caa --- /dev/null +++ b/fedora-39/Dockerfile @@ -0,0 +1,68 @@ +FROM fedora:39 +LABEL maintainer="tim@mondoo.com" +ARG BUILD_DATE +ARG VCS_REF + +LABEL org.label-schema.schema-version="1.0" +LABEL org.label-schema.build-date=$BUILD_DATE +LABEL org.label-schema.name="test-kitchen/dokken-images" +LABEL org.label-schema.description="A Docker container for testing Fedora 39" +LABEL org.label-schema.vcs-url="https://github.com/test-kitchen/dokken-images" +LABEL org.label-schema.vcs-ref=$VCS_REF +LABEL org.label-schema.vendor="test-kitchen" + +# hadolint ignore=DL3041 +RUN mkdir /var/cache/libdnf5 && \ + dnf -y install \ + binutils \ + ca-certificates \ + cronie \ + curl \ + dmidecode \ + ethtool \ + file \ + fipscheck \ + gnupg2 \ + hostname \ + initscripts \ + iproute \ + iptables \ + iputils \ + less \ + lsof \ + nc \ + net-tools \ + nmap \ + openssl \ + passwd \ + procps \ + strace \ + sudo \ + systemd-sysv \ + systemd-udev \ + tcpdump \ + telnet \ + util-linux \ + vim-minimal \ + wget \ + libxcrypt-compat \ + which && \ + dnf upgrade -y && \ + dnf clean all && \ + rm -rf /var/log/* && \ + # Don't start any optional services. + find /etc/systemd/system \ + /lib/systemd/system \ + -path '*.wants/*' \ + \( -name '*getty*' \ + -or -name '*systemd-logind*' \ + -or -name '*systemd-vconsole-setup*' \ + -or -name '*systemd-readahead*' \ + -or -name '*kdump*' \ + -or -name '*dnf-makecache*' \ + -or -name '*udev*' \) \ + -exec rm -v {} \; && \ + systemctl set-default multi-user.target && \ + systemctl mask dev-hugepages.mount sys-fs-fuse-connections.mount network.service systemd-journal-flush.service + +CMD [ "/usr/lib/systemd/systemd" ]