diff --git a/Containerfile b/Containerfile index 5eadc78..145635a 100644 --- a/Containerfile +++ b/Containerfile @@ -1,13 +1,8 @@ FROM scratch as ctx COPY build_scripts / -FROM ghcr.io/nushell/nushell:latest-alpine as nushell - FROM quay.io/fedora/fedora-bootc:44 as base -COPY --from=nushell /usr/bin/nu /usr/bin/nu -RUN printf '/bin/nu\n/usr/bin/nu' >> /etc/shells - COPY yum-repos/custom.repo /etc/yum.repos.d/custom.repo RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ @@ -25,9 +20,6 @@ RUN bootc container lint FROM quay.io/fedora/fedora-kinoite:44 as desktop -COPY --from=nushell /usr/bin/nu /usr/bin/nu -RUN printf '/bin/nu\n/usr/bin/nu\n' >> /etc/shells - COPY yum-repos/custom.repo /etc/yum.repos.d/custom.repo RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ @@ -57,9 +49,6 @@ FROM quay.io/fedora/fedora-kinoite:43 as laptop COPY dracut.conf /usr/lib/dracut/dracut.conf.d/50-custom-ostree.conf -COPY --from=nushell /usr/bin/nu /usr/bin/nu -RUN printf '/bin/nu\n/usr/bin/nu\n' >> /etc/shells - COPY yum-repos/custom.repo /etc/yum.repos.d/custom.repo RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ diff --git a/build_scripts/install-base.sh b/build_scripts/install-base.sh index 1aad59c..4369f62 100755 --- a/build_scripts/install-base.sh +++ b/build_scripts/install-base.sh @@ -30,6 +30,8 @@ dnf group install --assumeyes container-management dnf --repo=fury-carapace install --assumeyes carapace-bin +dnf --repo=gemfury-nushell install --assumeyes nushell + # yazi - terminal file explorer dnf --assumeyes copr enable lihaohong/yazi dnf --assumeyes install yazi diff --git a/yum-repos/custom.repo b/yum-repos/custom.repo index a80e7ed..adbfbdc 100644 --- a/yum-repos/custom.repo +++ b/yum-repos/custom.repo @@ -30,3 +30,9 @@ type=rpm enabled=0 gpgcheck=1 gpgkey=https://repository.mullvad.net/rpm/mullvad-keyring.asc + +[gemfury-nushell] +name=Gemfury Nushell Repo +baseurl=https://yum.fury.io/nushell/ +enabled=0 +gpgcheck=0