Skip to content

Commit

Permalink
Revert "feat: Generate image info"
Browse files Browse the repository at this point in the history
My bad...

This reverts commit 75e26c9.
  • Loading branch information
EyeCantCU committed Sep 22, 2023
1 parent 75e26c9 commit 415b995
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 36 deletions.
9 changes: 0 additions & 9 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"


FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main

ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG IMAGE_VENDOR="ublue-os"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"

COPY github-release-install.sh /tmp/github-release-install.sh
COPY image-info.sh /tmp/image-info.sh
COPY main-install.sh /tmp/main-install.sh
COPY main-post-install.sh /tmp/main-post-install.sh
COPY main-packages.json /tmp/main-packages.json
Expand All @@ -22,7 +18,6 @@ COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rp

COPY system_files /

RUN /tmp/image-info.sh
RUN /tmp/main-install.sh
RUN /tmp/main-post-install.sh

Expand All @@ -35,10 +30,7 @@ RUN mkdir -p /var/tmp && chmod -R 1777 /var/tmp


FROM main AS nvidia

ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG IMAGE_VENDOR="ublue-os"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}"

Expand All @@ -47,7 +39,6 @@ COPY nvidia-post-install.sh /tmp/nvidia-post-install.sh

COPY --from=ghcr.io/ublue-os/akmods-nvidia:${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms

RUN /tmp/image-info.sh
RUN /tmp/nvidia-install.sh
RUN /tmp/nvidia-post-install.sh
RUN rm -rf /tmp/* /var/*
Expand Down
26 changes: 0 additions & 26 deletions image-info.sh

This file was deleted.

1 change: 0 additions & 1 deletion main-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"htop",
"intel-media-driver",
"just",
"jq",
"kernel-devel-matched",
"kernel-tools",
"libheif-tools",
Expand Down

0 comments on commit 415b995

Please sign in to comment.