[PATCH v4 compass-ci 3/3] sparrow/4-docker/buildall: delete unnecessary code

[why] avoid to rebuild container, this issue already solved by calling docker_skip_rebuild() in each build script, so delete related code. Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/4-docker/buildall | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index e6ba448..4fcbac7 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -69,11 +69,8 @@ do container_name=$(basename $dir) [ "$container_name" == 'ssh-r' ] && continue - docker images | grep -wq "$container_name" - if [ "$?" != 0 ] || [ "$action" != "run-only" ]; then - build_depends $dir & - wait - fi + build_depends $dir & + wait start_depends $dir done -- 2.23.0

On Mon, Feb 08, 2021 at 06:28:34PM +0800, Liu Yinsi wrote:
[why] avoid to rebuild container, this issue already solved by calling docker_skip_rebuild() in each build script, so delete related code.
Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/4-docker/buildall | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index e6ba448..4fcbac7 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -69,11 +69,8 @@ do container_name=$(basename $dir) [ "$container_name" == 'ssh-r' ] && continue
- docker images | grep -wq "$container_name" - if [ "$?" != 0 ] || [ "$action" != "run-only" ]; then - build_depends $dir & - wait - fi + build_depends $dir & + wait
& 后面立即wait 等效于两个都没有: build_depends $dir Thanks, Fengguang
start_depends $dir done
-- 2.23.0
participants (2)
-
Liu Yinsi
-
Wu Fengguang