From c607903d61d39cfdb8578e4bb487dff447ddda04 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 26 May 2023 12:32:15 -0400 Subject: [PATCH] feat(dx): add nerd fonts, clean up repos (#239) --- Containerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index f1ed22c7260..ed81e3c7adc 100644 --- a/Containerfile +++ b/Containerfile @@ -57,11 +57,12 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" COPY dx/etc /etc RUN 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 +RUN wget https://terra.fyralabs.com/terra.repo -O /etc/yum.repos.d/terra.repo RUN rpm-ostree install code RUN rpm-ostree install lxd lxc RUN rpm-ostree install iotop dbus-x11 podman-compose podman-docker podman-plugins podman-tui -RUN rpm-ostree install cascadia-code-fonts google-droid-sans-mono-fonts google-go-mono-fonts ibm-plex-mono-fonts mozilla-fira-mono-fonts +RUN rpm-ostree install cascadiacode-nerd-fonts firacode-nerd-fonts google-droid-sans-mono-fonts google-go-mono-fonts ibmplexmono-nerd-fonts jetbrainsmono-nerd-fonts mozilla-fira-mono-fonts sourcecodepro-nerd-fonts ubuntu-nerd-fonts ubuntumono-nerd-fonts RUN rpm-ostree install qemu qemu-user-static qemu-user-binfmt virt-manager libvirt qemu qemu-user-static qemu-user-binfmt edk2-ovmf RUN rpm-ostree install cockpit-bridge cockpit-system cockpit-networkmanager cockpit-selinux cockpit-storaged cockpit-podman cockpit-machines cockpit-pcp @@ -70,5 +71,12 @@ COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm COPY --from=cgr.dev/chainguard/ko:latest /usr/bin/ko /usr/bin/ko COPY --from=cgr.dev/chainguard/minio-client:latest /usr/bin/mc /usr/bin/mc +# Clean up repos, everything is on the image so we don't need them +RUN rm -f /etc/yum.repos.d/terra.repo +RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo +RUN rm -f /etc/yum.repos.d/vscode.repo +RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo +RUN rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo + RUN rm -rf /tmp/* /var/* RUN ostree container commit