Skip to content
Snippets Groups Projects

Resolve L2SS-218 "Move existing tooling to bootstrap dir"

Merged Resolve L2SS-218 "Move existing tooling to bootstrap dir"
L2SS-218-move_existing_tooling_to_bootstrap_dir into master
Merged Thomas Juerges requested to merge L2SS-218-move_existing_tooling_to_bootstrap_dir into master
Viewing commit 69567495
Prev Next
Show latest version
1 file
+ 6
− 0
Compare changes
  • Side-by-side
  • Inline
  • 69567495
    Thomas Juerges
    L2SS-218 Disable exit on error in clean_images · 69567495
    Thomas Juerges authored 
    This allows make to return with a non-0 code which in turn does
not force Bash to exit.  This happens when the containers where
already down and/or the volumes cleaned up.
bootstrap/sbin/rebuild_system_from_scratch.sh
+ 6
− 0
@@ -48,8 +48,14 @@ function stop_images()
function clean_images()
{
# This can return a non-0 return code if the system
# has already been shut down.
# Therefore disable Bash's exit on error flag
set +e
pushd ${HOME_DIR}/docker-compose && make clean
popd
# And enable it again.
set -e
}
function start_minimal_tango()