Skip to content

Commit faf6a04

Browse files
author
MarcoFalke
committed
ci: Clean UID/GID mismatch
rsync --archive will preserve owner and group, which is then required to be handled by adding a git safe.directory workaround. Remove the need for the workaround by only preserving permissions during the recursive rsync copy.
1 parent 1be688f commit faf6a04

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

ci/test/02_run_container.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,9 @@ CI_EXEC () {
153153
export -f CI_EXEC
154154

155155
# Normalize all folders to BASE_ROOT_DIR
156-
CI_EXEC rsync --archive --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
156+
CI_EXEC rsync --recursive --perms --stats --human-readable "${BASE_READ_ONLY_DIR}/" "${BASE_ROOT_DIR}" || echo "Nothing to copy from ${BASE_READ_ONLY_DIR}/"
157157
CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh"
158158

159-
# Fixes permission issues when there is a container UID/GID mismatch with the owner
160-
# of the git source code directory.
161-
CI_EXEC git config --global --add safe.directory \"*\"
162-
163159
CI_EXEC mkdir -p "${BINS_SCRATCH_DIR}"
164160

165161
CI_EXEC "${BASE_ROOT_DIR}/ci/test/03_test_script.sh"

0 commit comments

Comments
 (0)