1
0
Fork 0

Compare commits

..

No commits in common. "e57c27451167edaeea06cf811d3f6efe952d9a7e" and "3ec2883d7bab58d8056af675ae694420d7123ba3" have entirely different histories.

2 changed files with 7 additions and 4 deletions

View file

@ -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 # dnf configuration has to be in effect during build
COPY etc/dnf /etc/dnf COPY etc/dnf /etc/dnf
# Apply configuration
COPY etc /etc
COPY usr /usr
# Run build logic # Run build logic
COPY build-scripts/kde.bash /tmp/kde.bash COPY build-scripts/kde.bash /tmp/kde.bash
RUN chmod +x /tmp/kde.bash RUN chmod +x /tmp/kde.bash
RUN /tmp/kde.bash RUN /tmp/kde.bash
# Apply configuration
COPY etc /etc
COPY usr /usr
LABEL quay.expires-after="" LABEL quay.expires-after=""

View file

@ -18,6 +18,9 @@ PKGS_NTSYNC="ntsync-autoload"
# Add packages # Add packages
dnf5 -y install --allowerasing ${PKGS_CODECS} ${PKGS_UTILS} ${PKGS_GENERAL} ${PKGS_DEFAULT_EDITOR} ${PKGS_NTSYNC} 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 # Apply configuration
# fix-up kconfig path # fix-up kconfig path
sed -i "/SCX_FLAGS=/ s/$/ --kconfig \/usr\/lib\/modules\/$(rpm -qa kernel | sed 's/kernel-//g')\/config/" /etc/default/scx sed -i "/SCX_FLAGS=/ s/$/ --kconfig \/usr\/lib\/modules\/$(rpm -qa kernel | sed 's/kernel-//g')\/config/" /etc/default/scx