From 0ec50dbc5aee52212e14aa4b6a6013c9ede33576 Mon Sep 17 00:00:00 2001
From: Andrew Obuchowicz <aobuchow@redhat.com>
Date: Thu, 16 May 2024 14:43:35 -0400
Subject: [PATCH 1/2] Revert "Fix: pin stow to version 2.3.1"

This reverts commit 862796328160600a752ec78af7fcf2ded6ad167d.

Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
---
 base/ubi8/Dockerfile | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/base/ubi8/Dockerfile b/base/ubi8/Dockerfile
index 7b20502a..c29a666f 100644
--- a/base/ubi8/Dockerfile
+++ b/base/ubi8/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p /home/tooling/
 RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     dnf update -y && \
     dnf install -y bash curl diffutils git git-lfs iproute jq less lsof man nano procps p7zip p7zip-plugins \
-                   perl-Digest-SHA net-tools openssh-clients rsync socat sudo time vim wget zip make && \
+                   perl-Digest-SHA net-tools openssh-clients rsync socat sudo time vim wget zip stow && \
                    dnf clean all
 
 ## gh-cli
@@ -91,30 +91,6 @@ RUN \
     cd - && \
     rm -rf "${TEMP_DIR}"
 
-## stow
-RUN \
-    TEMP_DIR="$(mktemp -d)"; \
-    cd "${TEMP_DIR}"; \
-    STOW_VERSION="2.3.1"; \
-    STOW_TGZ="stow-${STOW_VERSION}.tar.gz"; \
-    GNU_KEYRING="gnu-keyring.gpg"; \
-    STOW_TGZ_URL="http://ftpmirror.gnu.org/stow/${STOW_TGZ}"; \
-    STOW_CHEKSUMS_URL="http://ftpmirror.gnu.org/stow/${STOW_TGZ}.sig"; \
-    GNU_KEYRING_URL="https://ftp.gnu.org/gnu/gnu-keyring.gpg"; \
-    curl -sSLO "${STOW_TGZ_URL}" && \
-    curl -sSLO "${STOW_CHEKSUMS_URL}" && \
-    curl -sSLO "${GNU_KEYRING_URL}" && \
-    gpg --verify --keyring ./${GNU_KEYRING} "${STOW_TGZ}".sig "${STOW_TGZ}" && \
-    rm -rf ${HOME}/.gnupg && \
-    tar -zxv --no-same-owner -f "${STOW_TGZ}" && \
-    cd stow-${STOW_VERSION} && \
-    mkdir -p ./build && \
-    ./configure --prefix=${TEMP_DIR}/build && \
-    make install && \
-    cp -r ${TEMP_DIR}/build/bin/. /usr/bin/ && \
-    cp -r ${TEMP_DIR}/build/share/. /usr/share/ && \
-    stow --version
-
 COPY --chown=0:0 entrypoint.sh /
 COPY --chown=0:0 .stow-local-ignore /home/tooling/
 RUN \

From 00a841724a20e46ab8ac420ee03b4cbb90fe03a8 Mon Sep 17 00:00:00 2001
From: Andrew Obuchowicz <aobuchow@redhat.com>
Date: Thu, 16 May 2024 15:33:23 -0400
Subject: [PATCH 2/2] fix: Don't stow absolute symbolic links

Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
---
 base/ubi8/.stow-local-ignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/base/ubi8/.stow-local-ignore b/base/ubi8/.stow-local-ignore
index 9a4d5ce2..e4a7df98 100644
--- a/base/ubi8/.stow-local-ignore
+++ b/base/ubi8/.stow-local-ignore
@@ -5,3 +5,8 @@
 # but we don't want them to be symbolic links (or to cause stow conflicts). They will be copied to /home/user/ manually.
 \.bashrc
 \.bash_profile
+
+# Ignore absolute symbolic links, as they are not supported by stow
+\.krew
+\.sdkman
+\.local/bin/podman