From: Henrik Gombos <henrik99999@gmail.com>
Date: Fri, 2 Jun 2023 14:05:12 +0000 (+0000)
Subject: ci: cleanup containers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=739b9e1b38abfa998caec35048ab367a0d19ed76;p=thirdparty%2Fdracut.git

ci: cleanup containers

Remove /etc/profile.d/dracut-test.sh from test containers
No use to override default command
Remove references to docker. These files work just fine
with podman as well.
---

diff --git a/test/container/Dockerfile-Arch b/test/container/Dockerfile-Arch
index 2d62d80cd..f05ce8f1d 100644
--- a/test/container/Dockerfile-Arch
+++ b/test/container/Dockerfile-Arch
@@ -2,11 +2,6 @@ FROM docker.io/archlinux
 
 MAINTAINER https://github.com/dracutdevs/dracut
 
-ENV container docker
-LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE"
-
-RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
-
 # Install needed packages for the dracut CI container
 RUN pacman --noconfirm -Syu \
     linux dash strace dhclient asciidoc cpio pigz squashfs-tools \
@@ -20,6 +15,3 @@ RUN pacman -U --noconfirm ~build/perl-config-general/*.pkg.tar.*
 RUN su build -c 'cd && git clone https://aur.archlinux.org/tgt.git && cd tgt && makepkg -s --noconfirm'
 RUN pacman -U --noconfirm ~build/tgt/*.pkg.tar.*
 RUN rm -fr ~build
-
-# Set default command
-CMD ["/usr/bin/bash"]
diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian
index 225eedca0..d1bd3d9a8 100644
--- a/test/container/Dockerfile-Debian
+++ b/test/container/Dockerfile-Debian
@@ -2,11 +2,6 @@ FROM docker.io/debian:latest
 
 MAINTAINER https://github.com/dracutdevs/dracut
 
-ENV container docker
-LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE"
-
-RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
-
 # Install needed packages for the dracut CI container
 RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
@@ -69,6 +64,3 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get download dmraid \
     && DEBIAN_FRONTEND=noninteractive dpkg --configure dmraid \
     && apt-get install -yf \
     && apt-get clean
-
-# Set default command
-CMD ["/usr/bin/bash"]
diff --git a/test/container/Dockerfile-Fedora-latest b/test/container/Dockerfile-Fedora-latest
index 3cd488c6e..2668a8e1f 100644
--- a/test/container/Dockerfile-Fedora-latest
+++ b/test/container/Dockerfile-Fedora-latest
@@ -2,11 +2,6 @@ FROM registry.fedoraproject.org/fedora:latest
 
 MAINTAINER https://github.com/dracutdevs/dracut
 
-ENV container docker
-LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE"
-
-RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
-
 # Install needed packages for the dracut CI container
 RUN dnf -y install --setopt=install_weak_deps=False \
     asciidoc \
@@ -73,6 +68,3 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     which \
     xz \
     && dnf -y remove dracut --noautoremove && dnf -y update && dnf clean all
-
-# Set default command
-CMD ["/usr/bin/bash"]
diff --git a/test/container/Dockerfile-Gentoo b/test/container/Dockerfile-Gentoo
index fb636a4f5..3a2d5826f 100644
--- a/test/container/Dockerfile-Gentoo
+++ b/test/container/Dockerfile-Gentoo
@@ -12,11 +12,6 @@ COPY --from=kernel /lib/modules /lib/modules
 
 MAINTAINER https://github.com/dracutdevs/dracut
 
-ENV container docker
-LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE"
-
-RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
-
 # Only install `dmsetup`: attempting to install all of lvm2 fails due to missing kernel headers.
 RUN echo 'sys-fs/lvm2 device-mapper-only -thin' > /etc/portage/package.use/lvm2
 
@@ -43,6 +38,3 @@ RUN emerge -qv \
     sys-fs/ntfs3g \
     sys-fs/squashfs-tools \
     && rm -rf /var/cache/* /usr/share/doc/* /usr/share/man/*
-
-# Set default command
-CMD ["/usr/bin/bash"]
diff --git a/test/container/Dockerfile-OpenSuse-latest b/test/container/Dockerfile-OpenSuse-latest
index a8ab45857..ab31cfc37 100644
--- a/test/container/Dockerfile-OpenSuse-latest
+++ b/test/container/Dockerfile-OpenSuse-latest
@@ -2,11 +2,6 @@ FROM registry.opensuse.org/opensuse/tumbleweed-dnf:latest
 
 MAINTAINER https://github.com/dracutdevs/dracut
 
-ENV container docker
-LABEL RUN="docker run -it --name NAME --privileged --ipc=host --net=host --pid=host -e NAME=NAME -e IMAGE=IMAGE IMAGE"
-
-RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)' > /etc/profile.d/dracut-test.sh
-
 # Install needed packages for the dracut CI container
 RUN dnf -y install --setopt=install_weak_deps=False \
     dash asciidoc mdadm lvm2 dmraid cryptsetup nfs-utils nbd dhcp-server \
@@ -16,6 +11,3 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     iscsiuio open-iscsi which ShellCheck shfmt procps pigz parted squashfs ntfsprogs \
     multipath-tools \
     && dnf -y remove dracut && dnf -y update && dnf clean all
-
-# Set default command
-CMD ["/usr/bin/bash"]