feat: rename build_files to build_scripts (#2691)
This is more accurately describing what it actually is. Assisted-by: GNU sed 4.9
This commit is contained in:
parent
f6847b35df
commit
6365a13e88
19 changed files with 36 additions and 36 deletions
|
|
@ -21,7 +21,7 @@ FROM ghcr.io/ublue-os/akmods-zfs:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERN
|
|||
#endif
|
||||
|
||||
FROM scratch AS ctx
|
||||
COPY /build_files /build_files
|
||||
COPY /build_scripts /build_scripts
|
||||
|
||||
# /* https://github.com/get-aurora-dev/common */
|
||||
COPY --from=common /logos /system_files/shared
|
||||
|
|
@ -64,10 +64,10 @@ RUN --mount=type=tmpfs,dst=/boot \
|
|||
--mount=type=bind,from=akmods,src=/rpms/common,dst=/tmp/rpms/common \
|
||||
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
|
||||
--mount=type=secret,id=GITHUB_TOKEN \
|
||||
/ctx/build_files/shared/build.sh && \
|
||||
/ctx/build_files/base/01-packages.sh && \
|
||||
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_files/base/03-fetch.sh
|
||||
/ctx/build_scripts/shared/build.sh && \
|
||||
/ctx/build_scripts/base/01-packages.sh && \
|
||||
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_scripts/base/03-fetch.sh
|
||||
#endif
|
||||
|
||||
# /* aurora:stable with zfs no nvidia */
|
||||
|
|
@ -81,11 +81,11 @@ RUN --mount=type=tmpfs,dst=/boot \
|
|||
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
|
||||
--mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
|
||||
--mount=type=secret,id=GITHUB_TOKEN \
|
||||
/ctx/build_files/shared/build.sh && \
|
||||
/ctx/build_files/base/01-packages.sh && \
|
||||
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_files/base/zfs.sh && \
|
||||
/ctx/build_files/base/03-fetch.sh
|
||||
/ctx/build_scripts/shared/build.sh && \
|
||||
/ctx/build_scripts/base/01-packages.sh && \
|
||||
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_scripts/base/zfs.sh && \
|
||||
/ctx/build_scripts/base/03-fetch.sh
|
||||
#endif
|
||||
|
||||
# /* aurora-nvidia-open:latest no zfs */
|
||||
|
|
@ -99,11 +99,11 @@ RUN --mount=type=tmpfs,dst=/boot \
|
|||
--mount=type=bind,from=akmods,src=/rpms/kmods,dst=/tmp/rpms/kmods \
|
||||
--mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
|
||||
--mount=type=secret,id=GITHUB_TOKEN \
|
||||
/ctx/build_files/shared/build.sh && \
|
||||
/ctx/build_files/base/01-packages.sh && \
|
||||
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_files/base/03-fetch.sh && \
|
||||
/ctx/build_files/base/04-nvidia.sh
|
||||
/ctx/build_scripts/shared/build.sh && \
|
||||
/ctx/build_scripts/base/01-packages.sh && \
|
||||
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_scripts/base/03-fetch.sh && \
|
||||
/ctx/build_scripts/base/04-nvidia.sh
|
||||
#endif
|
||||
|
||||
# /* aurora-nvidia-open:stable with ZFS */
|
||||
|
|
@ -118,25 +118,25 @@ RUN --mount=type=tmpfs,dst=/boot \
|
|||
--mount=type=bind,from=akmods-nvidia-open,src=/rpms,dst=/tmp/rpms/nvidia \
|
||||
--mount=type=bind,from=akmods-zfs,src=/rpms/kmods/zfs,dst=/tmp/rpms/kmods/zfs \
|
||||
--mount=type=secret,id=GITHUB_TOKEN \
|
||||
/ctx/build_files/shared/build.sh && \
|
||||
/ctx/build_files/base/01-packages.sh && \
|
||||
/ctx/build_files/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_files/base/03-fetch.sh && \
|
||||
/ctx/build_files/base/04-nvidia.sh && \
|
||||
/ctx/build_files/base/zfs.sh
|
||||
/ctx/build_scripts/shared/build.sh && \
|
||||
/ctx/build_scripts/base/01-packages.sh && \
|
||||
/ctx/build_scripts/base/02-install-common-kernel-akmods.sh && \
|
||||
/ctx/build_scripts/base/03-fetch.sh && \
|
||||
/ctx/build_scripts/base/04-nvidia.sh && \
|
||||
/ctx/build_scripts/base/zfs.sh
|
||||
#endif
|
||||
|
||||
# /* Everything that can be done offline after things are in place should be done here */
|
||||
RUN --network=none \
|
||||
--mount=type=tmpfs,dst=/boot \
|
||||
--mount=type=bind,from=ctx,source=/,target=/ctx \
|
||||
/ctx/build_files/base/16-override-install.sh && \
|
||||
/ctx/build_files/base/17-cleanup.sh && \
|
||||
/ctx/build_files/base/18-image-info.sh && \
|
||||
/ctx/build_files/base/19-initramfs.sh && \
|
||||
/ctx/build_files/shared/validate-repos.sh && \
|
||||
/ctx/build_files/shared/clean-stage.sh && \
|
||||
/ctx/build_files/base/20-tests.sh
|
||||
/ctx/build_scripts/base/16-override-install.sh && \
|
||||
/ctx/build_scripts/base/17-cleanup.sh && \
|
||||
/ctx/build_scripts/base/18-image-info.sh && \
|
||||
/ctx/build_scripts/base/19-initramfs.sh && \
|
||||
/ctx/build_scripts/shared/validate-repos.sh && \
|
||||
/ctx/build_scripts/shared/clean-stage.sh && \
|
||||
/ctx/build_scripts/base/20-tests.sh
|
||||
|
||||
CMD ["/sbin/init"]
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@
|
|||
dnf5 versionlock add "${OVERRIDES[@]}"
|
||||
|
||||
# All DNF-related operations should be done here whenever possible
|
||||
#shellcheck source=build_files/shared/copr-helpers.sh
|
||||
source /ctx/build_files/shared/copr-helpers.sh
|
||||
#shellcheck source=build_scripts/shared/copr-helpers.sh
|
||||
source /ctx/build_scripts/shared/copr-helpers.sh
|
||||
|
||||
# NOTE:
|
||||
# Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
|
||||
|
|
@ -215,7 +215,7 @@ dnf versionlock add plasma-setup
|
|||
|
||||
# Install DX specific packages
|
||||
if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
|
||||
/ctx/build_files/dx/00-dx.sh
|
||||
/ctx/build_scripts/dx/00-dx.sh
|
||||
fi
|
||||
|
||||
echo "::endgroup::"
|
||||
|
|
@ -175,7 +175,7 @@ for unit in "${IMPORTANT_UNITS[@]}"; do
|
|||
done
|
||||
|
||||
if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
|
||||
/ctx/build_files/dx/10-tests-dx.sh;
|
||||
/ctx/build_scripts/dx/10-tests-dx.sh;
|
||||
fi
|
||||
|
||||
echo "::endgroup::"
|
||||
|
|
@ -5,8 +5,8 @@ echo "::group:: ===$(basename "$0")==="
|
|||
set -ouex pipefail
|
||||
|
||||
# Load secure COPR helpers
|
||||
# shellcheck source=build_files/shared/copr-helpers.sh
|
||||
source /ctx/build_files/shared/copr-helpers.sh
|
||||
# shellcheck source=build_scripts/shared/copr-helpers.sh
|
||||
source /ctx/build_scripts/shared/copr-helpers.sh
|
||||
|
||||
# NOTE:
|
||||
# Packages are split into FEDORA_PACKAGES and COPR_PACKAGES to prevent
|
||||
|
|
@ -32,10 +32,10 @@ setfattr -n user.component -v "aurora-config" /usr/share/ublue-os
|
|||
setfattr -n user.component -v "homebrew" /usr/share/homebrew.tar.zst
|
||||
|
||||
if [[ "${IMAGE_FLAVOR}" == "dx" ]]; then
|
||||
/ctx/build_files/shared/build-dx.sh
|
||||
/ctx/build_scripts/shared/build-dx.sh
|
||||
fi
|
||||
|
||||
mkdir -p /tmp/scripts/helpers
|
||||
install -Dm0755 /ctx/build_files/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
|
||||
install -Dm0755 /ctx/build_scripts/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
|
||||
|
||||
echo "::endgroup::"
|
||||
Loading…
Reference in a new issue