Skip to content

Commit f685f49

Browse files
committed
build: better build tools-v2 and mount /etc/hosts
Signed-off-by: zztaki <zztaki@outlook.com>
1 parent 88a6091 commit f685f49

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

util/build_functions.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,15 @@ build_target() {
213213
fi
214214
done
215215

216-
# build tools-v2
216+
# build tools-v2 when all targets are built
217217
g_toolsv2_root="tools-v2"
218-
if [ $g_release -eq 1 ]
219-
then
220-
(cd ${g_toolsv2_root} && make build version=${curve_version})
221-
else
222-
(cd ${g_toolsv2_root} && make debug version=${curve_version})
218+
if [[ "$g_target" = "*" ]]; then
219+
if [ $g_release -eq 1 ]
220+
then
221+
(cd ${g_toolsv2_root} && make build version=${curve_version})
222+
else
223+
(cd ${g_toolsv2_root} && make debug version=${curve_version})
224+
fi
223225
fi
224226
}
225227

util/docker_opts.sh

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ g_docker_opts=(
99
"-v /etc/sudoers.d/:/etc/sudoers.d/"
1010
"-v /etc/sudoers:/etc/sudoers:ro"
1111
"-v /etc/shadow:/etc/shadow:ro"
12+
"-v /etc/hosts:/etc/hosts"
1213
"-v /var/run/docker.sock:/var/run/docker.sock"
1314
"-v /root/.docker:/root/.docker"
1415
"--ulimit core=-1"

0 commit comments

Comments
 (0)