ci/lib-docker: preserve required environment variables
We're using "su -m" to preserve environment variables in the shell run by "su". But, that options will be ignored while "-l" (aka "--login") is specified in util-linux and busybox's su. In a later patch this script will be reused for checking Git for Linux with musl libc on Alpine Linux, Alpine Linux uses "su" from busybox. Since we don't have interest in all environment variables, pass only those necessary variables to the inner script. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Đoàn Trần Công Danh committed
Apr 4, 2020 at 08:08 UTC
ffce2ebdd9ad14d1ba315592157c03ce7ebd6212
1 file changed
+10
-3
ci/run-linux32-build.sh
+10
-3
@@ -51,10 +51,17 @@ else
51
fi
52
53
# Build and test
54
-linux32 --32bit i386 su -m -l $CI_USER -c '
54
+linux32 --32bit i386 su -m -l $CI_USER -c "
55
set -ex
56
+ export DEVELOPER='$DEVELOPER'
57
+ export DEFAULT_TEST_TARGET='$DEFAULT_TEST_TARGET'
58
+ export GIT_PROVE_OPTS='$GIT_PROVE_OPTS'
59
+ export GIT_TEST_OPTS='$GIT_TEST_OPTS'
60
+ export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB'
61
+ export MAKEFLAGS='$MAKEFLAGS'
62
+ export cache_dir='$cache_dir'
63
cd /usr/src/git
57
- test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove
64
+ test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove
65
make
66
make test
60
-'
67
+"