diff --git a/containers/Dockerfile.kde b/containers/Dockerfile.kde index e61bf11..376383b 100644 --- a/containers/Dockerfile.kde +++ b/containers/Dockerfile.kde @@ -35,13 +35,13 @@ COPY --from=scx-build /build/scx/services/scx.service /usr/lib/systemd/system/sc # dnf configuration has to be in effect during build COPY etc/dnf /etc/dnf -# Apply configuration -COPY etc /etc -COPY usr /usr - # Run build logic COPY build-scripts/kde.bash /tmp/kde.bash RUN chmod +x /tmp/kde.bash RUN /tmp/kde.bash +# Apply configuration +COPY etc /etc +COPY usr /usr + LABEL quay.expires-after="" diff --git a/containers/build-scripts/kde.bash b/containers/build-scripts/kde.bash index b6fd412..7d87eaf 100644 --- a/containers/build-scripts/kde.bash +++ b/containers/build-scripts/kde.bash @@ -18,6 +18,9 @@ PKGS_NTSYNC="ntsync-autoload" # Add packages dnf5 -y install --allowerasing ${PKGS_CODECS} ${PKGS_UTILS} ${PKGS_GENERAL} ${PKGS_DEFAULT_EDITOR} ${PKGS_NTSYNC} +# Remove default color prompt (is replaced with a custom one) +dnf5 -y remove bash-color-prompt + # Apply configuration # fix-up kconfig path sed -i "/SCX_FLAGS=/ s/$/ --kconfig \/usr\/lib\/modules\/$(rpm -qa kernel | sed 's/kernel-//g')\/config/" /etc/default/scx