Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: prune unused packages #322

Merged
merged 2 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ jobs:
image-tag:
- stable
- stable-nvidia
- 41
- 41-nvidia
with:
image-name: ${{ matrix.image-name }}
image-registry: ghcr.io/rsturla/eternal-linux
image-tag: ${{ matrix.image-tag }}
flatpak-manifest-lists: |
lumina/flatpaks/base
lumina/flatpaks/${{ matrix.image-name }}
installer-version: 40
installer-version: 41
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
13 changes: 1 addition & 12 deletions lumina/Containerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
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}


# 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
Expand All @@ -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} \
Expand Down
10 changes: 0 additions & 10 deletions lumina/scripts/_base/007-install-development-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 0 additions & 20 deletions lumina/scripts/_base/015-firecracker.sh

This file was deleted.

5 changes: 0 additions & 5 deletions lumina/scripts/_base/016-wireguard.sh

This file was deleted.

Loading