From d9f2e08b51c982eff7b57e05cf3cd699f2ddee3d Mon Sep 17 00:00:00 2001 From: Andreas Hartmann Date: Tue, 31 Oct 2023 07:40:17 +0000 Subject: [PATCH] chore: Reorganize files into folders to make it plain where each file belongs in the containers file system and to simplify the `ADD` directives in the Containerfile. Signed-off-by: Andreas Hartmann --- Containerfile | 10 ++++------ kmsglog.conf => etc/systemd/system.conf.d/kmsglog.conf | 0 .../podman/.config/containers/containers.conf | 0 .../podman/.config/systemd/user/podman.service | 0 .../podman/.config/systemd/user/podman.socket | 0 .../podman/.config/systemd/user/prune.service | 0 .../podman/.config/systemd/user/prune.timer | 0 .../runner/.config/systemd/user/runner.service | 0 setup.sh => root/setup.sh | 0 xpackages.txt => root/xpackages.txt | 0 10 files changed, 4 insertions(+), 6 deletions(-) rename kmsglog.conf => etc/systemd/system.conf.d/kmsglog.conf (100%) rename containers.conf => home/podman/.config/containers/containers.conf (100%) rename podman.service => home/podman/.config/systemd/user/podman.service (100%) rename podman.socket => home/podman/.config/systemd/user/podman.socket (100%) rename prune.service => home/podman/.config/systemd/user/prune.service (100%) rename prune.timer => home/podman/.config/systemd/user/prune.timer (100%) rename runner.service => home/runner/.config/systemd/user/runner.service (100%) rename setup.sh => root/setup.sh (100%) rename xpackages.txt => root/xpackages.txt (100%) diff --git a/Containerfile b/Containerfile index cd11e34..5b46655 100644 --- a/Containerfile +++ b/Containerfile @@ -16,13 +16,11 @@ FROM quay.io/centos/centos:stream9 -ADD /setup.sh /xpackages.txt /root/ -ADD /containers.conf /home/podman/.config/containers/containers.conf -ADD /podman.service /podman.socket /prune.service /prune.timer /home/podman/.config/systemd/user/ -ADD /runner.service /home/runner/.config/systemd/user/ -ADD kmsglog.conf /etc/systemd/system.conf.d/ +ADD /root/ /root/ +ADD /etc/ /etc/ +ADD /home/ /home/ -# Allow image-builders to choose another version becides "latest" should +# Allow image-builders to choose another version besides "latest" should # an incompatible change be introduced. ARG RUNNER_VERSION=latest diff --git a/kmsglog.conf b/etc/systemd/system.conf.d/kmsglog.conf similarity index 100% rename from kmsglog.conf rename to etc/systemd/system.conf.d/kmsglog.conf diff --git a/containers.conf b/home/podman/.config/containers/containers.conf similarity index 100% rename from containers.conf rename to home/podman/.config/containers/containers.conf diff --git a/podman.service b/home/podman/.config/systemd/user/podman.service similarity index 100% rename from podman.service rename to home/podman/.config/systemd/user/podman.service diff --git a/podman.socket b/home/podman/.config/systemd/user/podman.socket similarity index 100% rename from podman.socket rename to home/podman/.config/systemd/user/podman.socket diff --git a/prune.service b/home/podman/.config/systemd/user/prune.service similarity index 100% rename from prune.service rename to home/podman/.config/systemd/user/prune.service diff --git a/prune.timer b/home/podman/.config/systemd/user/prune.timer similarity index 100% rename from prune.timer rename to home/podman/.config/systemd/user/prune.timer diff --git a/runner.service b/home/runner/.config/systemd/user/runner.service similarity index 100% rename from runner.service rename to home/runner/.config/systemd/user/runner.service diff --git a/setup.sh b/root/setup.sh similarity index 100% rename from setup.sh rename to root/setup.sh diff --git a/xpackages.txt b/root/xpackages.txt similarity index 100% rename from xpackages.txt rename to root/xpackages.txt