File tree 3 files changed +14
-5
lines changed
3 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -221,11 +221,7 @@ RUN \
221
221
mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; \
222
222
touch /var/lib/shared/overlay-images/images.lock; \
223
223
touch /var/lib/shared/overlay-layers/layers.lock && \
224
- # # Rootless podman install #5: but use VFS since we were not able to make Fuse work yet...
225
- # TODO switch this to fuse in OCP 4.12?
226
- mkdir -p "${HOME}" /.config/containers && \
227
- (echo '[storage]' ;echo 'driver = "vfs"' ) > "${HOME}" /.config/containers/storage.conf && \
228
- # # Rootless podman install #6: rename podman to allow the execution of 'podman run' using
224
+ # # Rootless podman install #5: rename podman to allow the execution of 'podman run' using
229
225
# # kubedock but 'podman build' using podman.orig
230
226
mv /usr/bin/podman /usr/bin/podman.orig && \
231
227
# Docker alias
Original file line number Diff line number Diff line change 5
5
# but we don't want them to be symbolic links (or to cause stow conflicts). They will be copied to /home/user/ manually.
6
6
\.bashrc
7
7
\.bash_profile
8
+
9
+ # Ignore files under .config directory
10
+ \.config
Original file line number Diff line number Diff line change @@ -118,6 +118,16 @@ else
118
118
ln -f -s /usr/bin/podman.orig /home/tooling/.local/bin/podman
119
119
fi
120
120
121
+ # Configure container builds to use vfs or fuse-overlayfs
122
+ if [ ! -d " ${HOME} /.config/containers" ]; then
123
+ mkdir -p ${HOME} /.config/containers
124
+ if [ -c " /dev/fuse" ] && [ -f " /usr/bin/fuse-overlayfs" ]; then
125
+ (echo ' [storage]' ; echo ' driver = "overlay"' ; echo ' [storage.options.overlay]' ; echo ' mount_program = "/usr/bin/fuse-overlayfs"' ) > ${HOME} /.config/containers/storage.conf
126
+ else
127
+ (echo ' [storage]' ; echo ' driver = "vfs"' ) > " ${HOME} " /.config/containers/storage.conf
128
+ fi
129
+ fi
130
+
121
131
# ############################################################################
122
132
# Stow: If persistUserHome is enabled, then the contents of /home/user/
123
133
# will be mounted by a PVC and overwritten. In this case, we use stow to
You can’t perform that action at this time.
0 commit comments