Skip to content

Commit b0e2c76

Browse files
committed
fix: Switch from rsync to conditional copy to fix issue with missing files
1 parent 1ab330b commit b0e2c76

27 files changed

+4
-14
lines changed

Containerfile

+4-14
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
77
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
88

99
ARG IMAGE_NAME="${IMAGE_NAME}"
10+
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
1011
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
1112

1213
COPY system_files/desktop/shared /
13-
COPY system_files/desktop/gnome/* /tmp/gnome
14-
COPY system_files/desktop/kde/* /tmp/kde
15-
RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \
16-
rsync -rvK /tmp/gnome/ / \
17-
; else \
18-
rsync -rvK /tmp/kde/ / \
19-
; fi
14+
COPY system_files/desktop/${BASE_IMAGE_NAME} /
2015

2116
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
2217
COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
@@ -164,16 +159,11 @@ RUN rm /usr/share/applications/shredder.desktop && \
164159
FROM bazzite as bazzite-deck
165160

166161
ARG IMAGE_NAME="${IMAGE_NAME}"
162+
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
167163
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
168164

169165
COPY system_files/deck/shared /
170-
COPY system_files/deck/gnome/* /tmp/gnome
171-
COPY system_files/deck/kde/* /tmp/kde
172-
RUN if grep "gnome" <<< "${IMAGE_NAME}"; then \
173-
rsync -rvK /tmp/gnome/ / \
174-
; else \
175-
rsync -rvK /tmp/kde/ / \
176-
; fi
166+
COPY system_files/deck/${BASE_IMAGE_NAME} /
177167

178168
# Setup Copr repos
179169
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-multilib-fedora-$(rpm -E %fedora).repo?arch=x86_64 -O /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \

0 commit comments

Comments
 (0)