From a057a9937ab666d9931c2100f700c3b734496455 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Thu, 8 Aug 2024 20:19:25 +0300 Subject: [PATCH] add tree package --- 1_prune.sh | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/1_prune.sh b/1_prune.sh index 7c09e8f..f4c93f9 100755 --- a/1_prune.sh +++ b/1_prune.sh @@ -86,11 +86,13 @@ rm -rf \ # OSTree will error out if both dirs exist # And rpm-ostree will be confused and use only one of them if [ -d ./usr/etc ]; then + echo echo WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY echo EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS echo The following files from /usr/etc will be merged to /etc: tree ./usr/etc + echo $RSYNC ./usr/etc/ ./etc rm -rf ./usr/etc fi diff --git a/Dockerfile b/Dockerfile index c3a54ff..584b04b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN cargo build --release FROM quay.io/fedora/fedora:40 # Install niceties -RUN dnf install -y python3 python3-pip python3-devel rsync git \ +RUN dnf install -y python3 python3-pip python3-devel rsync git tree \ libzstd openssl glib2 ghc-gio ostree skopeo selinux-policy-targeted # Copy the built binary after installing deps