diff --git a/Dockerfile-test b/Dockerfile-test index 0c0dd330..0d608d6a 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -28,6 +28,7 @@ RUN apk add --no-cache --virtual cluster-deps make musl-dev go git \ && cp docker/random-stopper.sh /usr/local/bin/random-stopper.sh \ && cp docker/random-killer.sh /usr/local/bin/random-killer.sh \ && cp docker/wait-killer-stopper.sh /usr/local/bin/wait-killer-stopper.sh \ + && cp docker/cluster-restart.sh /usr/local/bin/cluster-restart.sh \ && chmod +x /usr/local/bin/start-daemons.sh \ && apk del --purge cluster-deps \ && cd / && rm -rf /go/src /go/bin/gx /go/bin/gx-go diff --git a/docker/test-entrypoint.sh b/docker/test-entrypoint.sh index efc23c06..80030704 100644 --- a/docker/test-entrypoint.sh +++ b/docker/test-entrypoint.sh @@ -45,12 +45,16 @@ else sed -i 's/127\.0\.0\.1\/tcp\/9094/0.0.0.0\/tcp\/9094/' "$IPFS_CLUSTER_PATH/service.json" sed -i 's/127\.0\.0\.1\/tcp\/9095/0.0.0.0\/tcp\/9095/' "$IPFS_CLUSTER_PATH/service.json" fi -ipfs-cluster-service $@ & +ipfs-cluster-service --debug $@ & +# Testing scripts that spawn background processes are spawned and stopped here /usr/local/bin/random-stopper.sh & kill -STOP $! echo $! > /data/ipfs-cluster/random-stopper-pid /usr/local/bin/random-killer.sh & kill -STOP $! echo $! > /data/ipfs-cluster/random-killer-pid +/usr/local/bin/cluster-restart.sh & +kill -STOP $! +echo $! > /data/ipfs-cluster/cluster-restart-pid echo "Daemons launched" exec tail -f /dev/null