Skip to content

Commit

Permalink
Replace Fedora 36 (EOL) with Fedora 39 (#97)
Browse files Browse the repository at this point in the history
New OS time

Signed-off-by: Tim Smith <tsmith84@gmail.com>
  • Loading branch information
tas50 authored Jun 28, 2023
1 parent 36d5839 commit 552c3af
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
67 changes: 0 additions & 67 deletions fedora-36/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion fedora-37/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion fedora-38/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
68 changes: 68 additions & 0 deletions fedora-39/Dockerfile
Original file line number Diff line number Diff line change
@@ -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" ]

0 comments on commit 552c3af

Please sign in to comment.