From 3ddd6f8c041ea3f5dac137979a87953b0e4c1d66 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Fri, 1 Nov 2024 22:39:04 +0000 Subject: [PATCH 1/2] chore: prune unused packages --- lumina/Containerfile | 11 ---------- .../_base/007-install-development-tools.sh | 10 ---------- lumina/scripts/_base/015-firecracker.sh | 20 ------------------- lumina/scripts/_base/016-wireguard.sh | 5 ----- 4 files changed, 46 deletions(-) delete mode 100644 lumina/scripts/_base/015-firecracker.sh delete mode 100644 lumina/scripts/_base/016-wireguard.sh diff --git a/lumina/Containerfile b/lumina/Containerfile index 454e39a..c0abd77 100644 --- a/lumina/Containerfile +++ b/lumina/Containerfile @@ -4,15 +4,6 @@ ARG BASE_TAG=40 ARG FEDORA_VERSION=${BASE_TAG} -# TODO: Move this to the COPR and install as an RPM -FROM golang:1.21 AS tc-redirect-tap-build - -RUN git clone https://github.com/awslabs/tc-redirect-tap.git --depth 1 /tmp/tc-redirect-tap && \ - cd /tmp/tc-redirect-tap && \ - CGOENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/tc-redirect-tap-amd64 ./cmd/tc-redirect-tap && \ - CGOENABLED=0 GOOS=linux GOARCH=arm64 go build -o bin/tc-redirect-tap-arm64 ./cmd/tc-redirect-tap - - FROM ${BASE_REGISTRY}:${BASE_TAG} ARG FEDORA_VERSION @@ -22,8 +13,6 @@ COPY files/_base / COPY files/_${BASE_IMAGE} / COPY scripts/ /tmp/scripts/ -COPY --from=tc-redirect-tap-build /tmp/tc-redirect-tap/bin/tc-redirect-tap-amd64 /usr/cni/bin/tc-redirect-tap - RUN chmod +x /tmp/scripts/*.sh /tmp/scripts/*.sh /tmp/scripts/_${BASE_IMAGE}/*.sh && \ /tmp/scripts/setup.sh --base ${BASE_IMAGE} && \ /tmp/scripts/cleanup.sh --base ${BASE_IMAGE} \ diff --git a/lumina/scripts/_base/007-install-development-tools.sh b/lumina/scripts/_base/007-install-development-tools.sh index 6e6e138..51249be 100644 --- a/lumina/scripts/_base/007-install-development-tools.sh +++ b/lumina/scripts/_base/007-install-development-tools.sh @@ -23,21 +23,11 @@ EOF # Install development tools rpm-ostree install \ code \ - $(curl https://api.github.com/repos/wagoodman/dive/releases/latest | jq -r '.assets[] | select(.name| test(".*_linux_amd64.rpm$")).browser_download_url') \ gh \ git-credential-oauth curl -Lo /tmp/devbox https://releases.jetpack.io/devbox install -c -m 0755 /tmp/devbox /usr/bin/devbox -# Install Zed IDE -curl -Lo /tmp/zed.tar.gz https://zed.dev/api/releases/stable/latest/zed-linux-x86_64.tar.gz -mkdir -p /usr/lib/zed.app/ -tar -xvf /tmp/zed.tar.gz -C /usr/lib/zed.app/ --strip-components=1 -ln -s /usr/lib/zed.app/bin/zed /usr/bin/zed -cp /usr/lib/zed.app/share/applications/zed.desktop /usr/share/applications/dev.zed.Zed.desktop -sed -i "s|Icon=zed|Icon=/usr/lib/zed.app/share/icons/hicolor/512x512/apps/zed.png|g" /usr/share/applications/dev.zed.Zed.desktop -sed -i "s|Exec=zed|Exec=/usr/lib/zed.app/libexec/zed-editor|g" /usr/share/applications/dev.zed.Zed.desktop - rm -f /etc/yum.repos.d/github.repo rm -f /etc/yum.repos.d/vscode.repo diff --git a/lumina/scripts/_base/015-firecracker.sh b/lumina/scripts/_base/015-firecracker.sh deleted file mode 100644 index e60c773..0000000 --- a/lumina/scripts/_base/015-firecracker.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/bash - -set -euox pipefail - -RELEASE_URL="https://github.com/firecracker-microvm/firecracker/releases" -LATEST_VERSION=$(basename $(curl -fsSLI -o /dev/null -w %{url_effective} ${RELEASE_URL}/latest)) - -curl -L ${RELEASE_URL}/download/${LATEST_VERSION}/firecracker-${LATEST_VERSION}-$(uname -m).tgz | tar -xz -C /tmp - -install -c -m 0755 /tmp/release-${LATEST_VERSION}-$(uname -m)/firecracker-${LATEST_VERSION}-$(uname -m) /usr/bin/firecracker -install -c -m 0755 /tmp/release-${LATEST_VERSION}-$(uname -m)/jailer-${LATEST_VERSION}-$(uname -m) /usr/bin/jailer - - -curl -Lo /tmp/cni-plugins.tgz $(curl https://api.github.com/repos/containernetworking/plugins/releases/latest | jq -r '.assets[] | select(.name| test("cni-plugins-linux-amd64-v.*.tgz$")).browser_download_url') -mkdir -p /usr/cni/bin -tar -xzf /tmp/cni-plugins.tgz -C /usr/cni/bin - -cat >/usr/lib/tmpfiles.d/eternal-cni.conf < Date: Fri, 1 Nov 2024 22:41:07 +0000 Subject: [PATCH 2/2] chore: remove F40 builds --- .github/workflows/build-iso.yml | 4 +++- .github/workflows/build.yml | 4 ++-- lumina/Containerfile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml index 52a0ce7..8ed5e4b 100644 --- a/.github/workflows/build-iso.yml +++ b/.github/workflows/build-iso.yml @@ -32,6 +32,8 @@ jobs: image-tag: - stable - stable-nvidia + - 41 + - 41-nvidia with: image-name: ${{ matrix.image-name }} image-registry: ghcr.io/rsturla/eternal-linux @@ -39,4 +41,4 @@ jobs: flatpak-manifest-lists: | lumina/flatpaks/base lumina/flatpaks/${{ matrix.image-name }} - installer-version: 40 + installer-version: 41 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5f308b..5bed629 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - fedora-version: [40, 41, stable] + fedora-version: [41, stable] base-image: [silverblue, cosmic] permissions: contents: read @@ -109,7 +109,7 @@ jobs: strategy: fail-fast: false matrix: - fedora-version: [40, 41, stable] + fedora-version: [41, stable] base-image: [silverblue, cosmic] nvidia-type: [open] permissions: diff --git a/lumina/Containerfile b/lumina/Containerfile index c0abd77..531e924 100644 --- a/lumina/Containerfile +++ b/lumina/Containerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=silverblue ARG BASE_REGISTRY=ghcr.io/rsturla/eternal-linux/main/${BASE_IMAGE} -ARG BASE_TAG=40 +ARG BASE_TAG=41 ARG FEDORA_VERSION=${BASE_TAG}