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

Fix: revert "Fix: pin stow to version 2.3.1"; don't stow absolute symbolic links #173

Merged
merged 2 commits into from
May 17, 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
5 changes: 5 additions & 0 deletions base/ubi8/.stow-local-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 1 addition & 25 deletions base/ubi8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
Loading