diff --git a/Containerfile b/Containerfile index 4f51d92..ec4feec 100644 --- a/Containerfile +++ b/Containerfile @@ -1,10 +1,18 @@ -FROM registry.fedoraproject.org/fedora:latest +FROM registry.fedoraproject.org/fedora:latest AS builder -RUN dnf update -y && dnf install wget -y && dnf clean all +RUN dnf update -y && dnf install --disablerepo='*' --enablerepo='fedora,updates' --setopt install_weak_deps=0 --nodocs --assumeyes wget && dnf clean all + +RUN mkdir -p /tmp/ublue-os/files/{etc,usr} +COPY usr /tmp/ublue-os/files/usr +COPY etc /tmp/ublue-os/files/etc + +RUN wget "https://github.com/loft-sh/devpod/releases/latest/download/devpod-linux-amd64" -O /tmp/devpod && \ + install -c -m 0755 /tmp/devpod /tmp/ublue-os/files/usr/bin && \ + wget "https://terra.fyralabs.com/terra.repo" -O /tmp/ublue-os/files/etc/yum.repos.d/terra.repo && \ + curl -s "https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh" >> /tmp/ublue-nix-install && \ + install -c -m 0755 /tmp/ublue-nix-install /tmp/ublue-os/files/usr/bin + +FROM scratch + +COPY --from=builder /tmp/ublue-os/files /files -RUN wget https://github.com/loft-sh/devpod/releases/latest/download/devpod-linux-amd64 -O /tmp/devpod && \ - install -c -m 0755 /tmp/devpod /usr/bin && \ - wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ - wget https://terra.fyralabs.com/terra.repo -O /etc/yum.repos.d/terra.repo && \ - curl -s https://raw.githubusercontent.com/dnkmmr69420/nix-installer-scripts/main/installer-scripts/silverblue-nix-installer.sh -O /usr/bin/ublue-nix-install && \ - chmod +x /usr/bin/ublue-nix-install diff --git a/README.md b/README.md index 4afc102..aacd2e5 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,16 @@ A layer for extras and more bling for your image You can add this to your Containerfile to copy anything from this image over: - COPY --from=ghcr.io/ublue-os/bling:latest /usr/bin/ublue-nix-installer / - COPY --from=ghcr.io/ublue-os/bling:latest /usr/bin/ublue-nix-uninstaller / + COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix-installer / + COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix-uninstaller / To use all fonts: - COPY --from=ublue-os/bling:latest /usr/share/fonts /path/to/fonts + COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/fonts /path/to/fonts To use only Inter do: - COPY --from=ublue-os/bling:latest /usr/share/fonts/inter /path/to/fonts/inter + COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/fonts/inter /path/to/fonts/inter We also want to package all these modifications as RPM packages for easier installation. `(TO BE DONE)`