chore: Bring over upstream changes to ublue-updater

This commit is contained in:
Kyle Gospodnetich 2023-06-30 12:06:53 -07:00
parent ecf0f24cef
commit 2e8b6664b6

View File

@ -13,8 +13,10 @@ COPY system_files/desktop/etc /etc
COPY system_files/desktop/usr /usr
# Add ublue-updater
COPY --from=ghcr.io/gerblesh/ublue-updater:latest /rpms/ublue-updater.noarch.rpm /tmp/rpms/
RUN rpm-ostree install /tmp/rpms/ublue-updater.noarch.rpm --uninstall ublue-os-update-services
COPY --from=ghcr.io/gerblesh/ublue-update:latest /rpms/ublue-update.noarch.rpm /tmp/rpms/
RUN rpm-ostree override remove \
ublue-os-update-services \
--install=/tmp/rpms/ublue-update.noarch.rpm
# Add Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@ -58,6 +60,7 @@ RUN pip install --prefix=/usr yafti && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
systemctl enable ublue-update.timer && \
systemctl enable input-remapper.service && \
rm -rf \
/tmp/* \