From b964cc41a3f46421357cb83f3ef6b49b5f1340c8 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Tue, 18 Jul 2023 19:01:01 -0400 Subject: [PATCH] feat: move developer-centric things to -dx We don't need all this stuff in the vanilla image --- Containerfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Containerfile b/Containerfile index 0a68b676946..4f0b0e30007 100644 --- a/Containerfile +++ b/Containerfile @@ -15,7 +15,7 @@ COPY usr /usr COPY --from=docker.io/bketelsen/vanilla-os:v0.0.12 /usr/share/backgrounds/vanilla /usr/share/backgrounds/vanilla COPY --from=docker.io/bketelsen/vanilla-os:v0.0.12 /usr/share/gnome-background-properties/vanilla.xml /usr/share/gnome-background-properties/vanilla.xml - +COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland @@ -42,15 +42,6 @@ RUN /tmp/build.sh && \ mkdir -p /var/tmp && \ chmod -R 1777 /var/tmp -# K8s tools - -COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl -COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign - -RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" -RUN chmod +x ./kind -RUN mv ./kind /usr/bin/kind - ## bluefin-dx developer edition image section # TODO: this should be in packages.json but yolo for now @@ -75,10 +66,16 @@ RUN rpm-ostree install qemu qemu-user-static qemu-user-binfmt virt-manager libvi RUN rpm-ostree install cockpit cockpit-system cockpit-networkmanager cockpit-selinux cockpit-storaged cockpit-podman cockpit-machines cockpit-pcp RUN rpm-ostree install cargo nodejs-npm p7zip p7zip-plugins powertop rust +COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux 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 +COPY --from=cgr.dev/chainguard/kubectl:latest /usr/bin/kubectl /usr/bin/kubectl + +RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64" +RUN chmod +x ./kind +RUN mv ./kind /usr/bin/kind # Install DevPod RUN wget https://github.com/loft-sh/devpod/releases/latest/download/DevPod_linux_x86_64.rpm -O /tmp/devpod.rpm && \