Skip to content

Commit

Permalink
Merge pull request #90 from faeizmahrus/main
Browse files Browse the repository at this point in the history
fix: Correct fedora-example and clean packages/
  • Loading branch information
castrojo authored Dec 25, 2024
2 parents 0a8a9af + ea68bbc commit b148eea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 42 deletions.
17 changes: 7 additions & 10 deletions ContainerFiles/fedora-example
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ LABEL com.github.containers.toolbox="true" \
summary="An example ContainerFile to demonstrate multiple image builds." \
maintainer="[email protected]"

COPY ../packages/fedora-sample-packages /
RUN dnf update -y && \
grep -v '^#' /fedora-sample-packages | xargs dnf install -y
RUN rm /fedora-sample-packages
# Copy the setup scripts and package list
COPY ../scripts/fedora-sample.sh /
COPY ../scripts/distrobox-shims.sh /
COPY ../packages/fedora-example.packages /

RUN ln -fs /bin/sh /usr/bin/sh && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
# Run the setup scripts
RUN chmod +x fedora-example.sh distrobox-shims.sh && /fedora-example.sh
RUN rm /fedora-example.sh /distrobox-shims.sh /fedora-example.packages
30 changes: 0 additions & 30 deletions packages/boxkit-packages

This file was deleted.

1 change: 0 additions & 1 deletion packages/fedora-example-packages

This file was deleted.

1 change: 0 additions & 1 deletion packages/fedora-sample-packages

This file was deleted.

0 comments on commit b148eea

Please sign in to comment.