Fix test container name

This commit is contained in:
BHodl
2022-03-21 20:24:42 -04:00
parent e5cdd071b7
commit 18f7bcb4a3
2 changed files with 4 additions and 2 deletions

View File

@@ -59,9 +59,10 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
<% } %>
current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
dist_dir=${current_path##/*/}
# Let's make sure the container readyness files are deleted before starting the stack
docker run --rm -v cyphernode_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
docker run --rm -v ${dist_dir}_container_monitor:/container_monitor alpine sh -c 'rm -f /container_monitor/*_ready'
<% if (docker_mode == 'swarm') { %>
docker stack deploy -c $current_path/docker-compose.yaml cyphernode

View File

@@ -52,12 +52,13 @@ export USER=$(id -u <%= default_username %>):$(id -g <%= default_username %>)
<% } %>
current_path="$(cd "$(dirname "$0")" >/dev/null && pwd)"
dist_dir=${current_path##/*/}
# Will test if Cyphernode is fully up and running...
docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
-v <%= gatekeeper_datapath %>:/gatekeeper \
-v $current_path:/dist \
-v cyphernode_container_monitor:/container_monitor:ro \
-v ${dist_dir}_container_monitor:/container_monitor:ro \
--network cyphernodenet eclipse-mosquitto:<%= mosquitto_version %> /testfeatures.sh
if [ -f $current_path/exitStatus.sh ]; then