chore: Move image-info to new shared directory, handle in single COPY step

This commit is contained in:
Kyle Gospodnetich 2023-09-22 14:22:55 -07:00
parent bb9dff8409
commit b22030e12c
2 changed files with 2 additions and 4 deletions

View File

@ -12,8 +12,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
COPY system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
COPY image-info.sh /tmp/image-info.sh
COPY system_files/shared system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
@ -227,8 +226,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
COPY system_files/deck/shared system_files/deck/${BASE_IMAGE_NAME} /
COPY image-info.sh /tmp/image-info.sh
COPY system_files/shared system_files/deck/shared system_files/deck/${BASE_IMAGE_NAME} /
# Setup Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \