Skip to content

Commit

Permalink
ci: cleanup containers
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Henrik66 authored and aafeijoo-suse committed Jun 6, 2023
1 parent ae7cd94 commit 739b9e1
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 40 deletions.
8 changes: 0 additions & 8 deletions test/container/Dockerfile-Arch
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"]
8 changes: 0 additions & 8 deletions test/container/Dockerfile-Debian
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"]
8 changes: 0 additions & 8 deletions test/container/Dockerfile-Fedora-latest
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"]
8 changes: 0 additions & 8 deletions test/container/Dockerfile-Gentoo
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]
8 changes: 0 additions & 8 deletions test/container/Dockerfile-OpenSuse-latest
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"]

0 comments on commit 739b9e1

Please sign in to comment.