Skip to content

Commit 3eabf68

Browse files
author
cgruver
committed
create a common entrypoint for base and udi, fix .config ownership for podman 5
Signed-off-by: cgruver <[email protected]>
1 parent b5dc4bf commit 3eabf68

File tree

4 files changed

+31
-28
lines changed

4 files changed

+31
-28
lines changed

base/ubi9/.stow-local-ignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
\.krew
1111
\.sdkman
1212
\.local/bin/podman
13+
14+
# Ignore files under .config directory
15+
\.config

base/ubi9/entrypoint.sh

+28
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ if [ ! -d "${HOME}/.config/containers" ]; then
1515
fi
1616
fi
1717

18+
# Create Sym Link for Composer Keys in /home/tooling/.config
19+
if [ -d /home/tooling/.config/composer ] && [ ! -d "${HOME}/.config/composer" ]; then
20+
mkdir -p ${HOME}/.config/composer
21+
ln -s /home/tooling/.config/composer/keys.dev.pub ${HOME}/.config/composer/keys.dev.pub
22+
ln -s /home/tooling/.config/composer/keys.tags.pub ${HOME}/.config/composer/keys.tags.pub
23+
fi
24+
1825
# Setup $PS1 for a consistent and reasonable prompt
1926
if [ -w "${HOME}" ] && [ ! -f "${HOME}"/.bashrc ]; then
2027
echo "PS1='[\u@\h \W]\$ '" > "${HOME}"/.bashrc
@@ -30,4 +37,25 @@ fi
3037

3138
source kubedock_setup
3239

40+
# Stow
41+
## Required for https://github.com/eclipse/che/issues/22412
42+
43+
# /home/user/ will be mounted to by a PVC if persistUserHome is enabled
44+
mountpoint -q /home/user/; HOME_USER_MOUNTED=$?
45+
46+
# This file will be created after stowing, to guard from executing stow everytime the container is started
47+
STOW_COMPLETE=/home/user/.stow_completed
48+
49+
if [ $HOME_USER_MOUNTED -eq 0 ] && [ ! -f $STOW_COMPLETE ]; then
50+
# Create symbolic links from /home/tooling/ -> /home/user/
51+
stow . -t /home/user/ -d /home/tooling/ --no-folding -v 2 > /tmp/stow.log 2>&1
52+
# Vim does not permit .viminfo to be a symbolic link for security reasons, so manually copy it
53+
cp /home/tooling/.viminfo /home/user/.viminfo
54+
# We have to restore bash-related files back onto /home/user/ (since they will have been overwritten by the PVC)
55+
# but we don't want them to be symbolic links (so that they persist on the PVC)
56+
cp /home/tooling/.bashrc /home/user/.bashrc
57+
cp /home/tooling/.bash_profile /home/user/.bash_profile
58+
touch $STOW_COMPLETE
59+
fi
60+
3361
exec "$@"

universal/ubi9/Dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,6 @@ RUN chgrp -R 0 /home && chmod -R g=u /etc/passwd /etc/group /home /etc/pki
423423
# cleanup dnf cache
424424
RUN dnf -y clean all --enablerepo='*'
425425

426-
COPY --chown=0:0 entrypoint.sh /
427-
428426
USER 10001
429427

430428
ENV HOME=/home/user

universal/ubi9/entrypoint.sh

-26
This file was deleted.

0 commit comments

Comments
 (0)