Skip to content

Commit

Permalink
move fake_xattr to build time only
Browse files Browse the repository at this point in the history
having it in container entrypoint breaks tests, as test leaves orphaned processes running => causing test to never terminate
(TODO: fix tests)
  • Loading branch information
nkraetzschmar committed Apr 18, 2024
1 parent 719b582 commit ccd9a9c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ if [ -d cert ]; then
container_mount_opts+=(-v "$PWD/cert:/builder/cert:ro")
fi

"$container_engine" run --rm "${container_run_opts[@]}" "${container_mount_opts[@]}" "$container_image" ${container_cmd[@]+"${container_cmd[@]}"} make --no-print-directory -C /builder "${make_opts[@]}" "$@" >&3
"$container_engine" run --rm "${container_run_opts[@]}" "${container_mount_opts[@]}" "$container_image" ${container_cmd[@]+"${container_cmd[@]}"} fake_xattr make --no-print-directory -C /builder "${make_opts[@]}" "$@" >&3
2 changes: 1 addition & 1 deletion setup_namespace
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ if [ "${1-}" = --second-stage ]; then
mount -t tmpfs -o size=4G tmpfs /tmp
"$@"
else
unshare --map-root-user --map-users auto --map-groups auto --mount fake_xattr "$0" --second-stage "$@"
unshare --map-root-user --map-users auto --map-groups auto --mount "$0" --second-stage "$@"
fi

0 comments on commit ccd9a9c

Please sign in to comment.