diff --git a/docker/main/Makefile.in b/docker/main/Makefile.in index 7bae0446..425880fd 100644 --- a/docker/main/Makefile.in +++ b/docker/main/Makefile.in @@ -49,6 +49,8 @@ else DOCKERFILE = Dockerfile endif +#DOCKERFLAGS="--no-cache" + # Example docker image. CHANGE THIS IF YOU PUSH IMG = clixon/clixon-system @@ -70,7 +72,7 @@ distclean: clean rm -f Makefile *~ .depend docker: clixon $(DOCKERFILE) - sudo docker build -f $(DOCKERFILE) -t $(IMG) . # --no-cache + sudo docker build -f $(DOCKERFILE) -t $(IMG) $(DOCKERFLAGS) . push: sudo docker push $(IMG) diff --git a/test/lib.sh b/test/lib.sh index d0484268..875ec4b3 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -291,10 +291,10 @@ wait_backend(){ reply=$(echo ']]>]]>' | $clixon_netconf -qef $cfg 2> /dev/null) let i=0; while [[ $reply != "]]>]]>' | clixon_netconf -qef $cfg 2> /dev/null) - echo "reply:$reply" +# echo "reply:$reply" let i++; # echo "wait_backend $i" if [ $i -ge $DEMLOOP ]; then diff --git a/test/vagrant/Makefile.in b/test/vagrant/Makefile.in index 1682386e..cc022d64 100644 --- a/test/vagrant/Makefile.in +++ b/test/vagrant/Makefile.in @@ -63,9 +63,9 @@ logs: # appear eg as generic/centos8.log $(VAGRANTS): logs ifdef LOGDIR - with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 > "$(LOGDIR)/$(subst /,-,$@).$(RESTCONF).log" + with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 > "$(LOGDIR)/$(subst /,-,$@)-$(RESTCONF).log" else - with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 | tee "logs/$(subst /,-,$@).$(RESTCONF).log" + with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 | tee "logs/$(subst /,-,$@)-$(RESTCONF).log" endif destroy: