Merge remote-tracking branch 'origin/feature/docker-kill-improvements'

# Conflicts:
#	bootseqs/release-v1.1/boot.sh

bootseqs/launch-clone/boot.sh

@@ -8,8 +8,11 @@
 #
 # This process must not BLOCK.
 
-docker kill -s TERM nodeos-bios || true
-docker rm nodeos-bios || true
+# Just in case, maybe delete the previous temp that might have not been deleted before
+docker rm nodeos-bios-temp &> /dev/null || true
+
+docker rename nodeos-bios nodeos-bios-temp || true
+docker kill -s TERM nodeos-bios-temp || true
 
 echo "Copying base config"
 cp base_config.ini config.ini
@@ -43,3 +46,6 @@ echo "Waiting 2 secs for nodeos to launch through Docker"
 sleep 2
 
 echo "See output.log for details logs"
+
+# We put this here to let time for the actual kill to happen
+docker rm nodeos-bios-temp || true

bootseqs/release-v1.1/boot.sh

@@ -10,8 +10,11 @@
 #
 # This process must not BLOCK.
 
-docker kill -s TERM nodeos-bios || true
-docker rm nodeos-bios || true
+# Just in case, maybe delete the previous temp that might have not been deleted before
+docker rm nodeos-bios-temp &> /dev/null || true
+
+docker rename nodeos-bios nodeos-bios-temp || true
+docker kill -s TERM nodeos-bios-temp || true
 
 echo "Copying base config"
 cp base_config.ini config.ini
@@ -29,7 +32,7 @@ sudo rm -rf /tmp/nodeos-data
 echo "Running 'nodeos' through Docker."
 docker run -ti --rm --detach --name nodeos-bios \
        -v `pwd`:/etc/nodeos -v /tmp/nodeos-data:/data \
-       -p 8888:8888 -p 9876:9876 \
+       -p 127.0.0.1:8888:8888 -p 127.0.0.1:9876:9876 \
        gcr.io/eoscanada-public/eosio-nodeos-prod:v1.1.1 \
        /opt/eosio/bin/nodeos --data-dir=/data \
                              --config-dir=/etc/nodeos \
@@ -45,3 +48,6 @@ echo "Waiting 2 secs for nodeos to launch through Docker"
 sleep 2
 
 echo "See output.log for details logs"
+
+# We put this here to let time for the actual kill to happen
+docker rm nodeos-bios-temp || true