[how] before: action=reboot after: action=run-only
[why] new param value more easy to understand.
usage 1: ./buildall -> execute $container/build, install first-run and start script usage 2: ./buildall run-only -> just execute $continer/first-run, start script, no build, install script.
Signed-off-by: Liu Yinsi liuyinsi@163.com --- sparrow/4-docker/buildall | 2 +- sparrow/7-systemd/cci-network | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 014036b..3c0b7b0 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -33,7 +33,7 @@ do_one() cd "$container" [ "$container_name" == 'ssh-r' ] && exit docker images | grep -wq "$container_name" - if [ "$?" != 0 ] || [ "$action" != "reboot" ]; then + if [ "$?" != 0 ] || [ "$action" != "run-only" ]; then [ -x build ] && ./build [ -x install ] && ./install fi diff --git a/sparrow/7-systemd/cci-network b/sparrow/7-systemd/cci-network index 6e59dbb..0438935 100755 --- a/sparrow/7-systemd/cci-network +++ b/sparrow/7-systemd/cci-network @@ -14,4 +14,4 @@ $CCI_SRC/sparrow/2-network/cifs
# --restart=always option is not absolutely reliable # container need to start its dependences firstly. -$CCI_SRC/sparrow/4-docker/buildall reboot +$CCI_SRC/sparrow/4-docker/buildall run-only