From f8475166e05c1ec61031eba2d867b81ace75f2e5 Mon Sep 17 00:00:00 2001 From: ver4a Date: Sun, 10 Nov 2024 11:19:27 +0100 Subject: [PATCH] Move applying configuration to end of build When applied before package installations/removals, some files might get modified/deleted. --- Dockerfile.kde | 6 +++--- Dockerfile.kde-nvidia | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.kde b/Dockerfile.kde index 9fd15da..41dd525 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -1,8 +1,5 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 -# Apply configuration -COPY etc /etc - # Remove firefox RUN rpm-ostree override remove firefox firefox-langpacks @@ -26,5 +23,8 @@ RUN rpm-ostree override remove bash-color-prompt # Remove rpm metadata cache RUN rpm-ostree cleanup --repomd +# Apply configuration +COPY etc /etc + # https://github.com/ostreedev/ostree-rs-ext/issues/159 RUN ostree container commit diff --git a/Dockerfile.kde-nvidia b/Dockerfile.kde-nvidia index 0df3869..72e082c 100644 --- a/Dockerfile.kde-nvidia +++ b/Dockerfile.kde-nvidia @@ -1,8 +1,5 @@ FROM quay.io/fedora-ostree-desktops/kinoite:41 -# Apply configuration -COPY etc /etc - # Remove firefox RUN rpm-ostree override remove firefox firefox-langpacks @@ -30,5 +27,8 @@ RUN rpm-ostree install akmod-nvidia xorg-x11-drv-nvidia-cuda && \ # Remove rpm metadata cache RUN rpm-ostree cleanup --repomd +# Apply configuration +COPY etc /etc + # https://github.com/ostreedev/ostree-rs-ext/issues/159 RUN ostree container commit