experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tolerate errors in docker startscripts

Browse source
This commit is contained in:
Olof hagsand 2020-07-07 15:51:42 +02:00
parent 5464eec540
commit a5bf3d57ce
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docker/main/Makefile.in
View file

@ -72,11 +72,10 @@ push:
sudo docker push $(IMG) sudo docker push $(IMG)
# Start the clixon system container and run the test script # Start the clixon system container and run the test script
# sleep is for waiting for start script to run properly before starting tests
# Note tests will kill the daemons started in the start scrips # Note tests will kill the daemons started in the start scrips
test: docker test: docker
./cleanup.sh ; PORT=8080 ./start.sh # kill (ignore error) and the start it ./cleanup.sh ; PORT=8080 ./start.sh # kill (ignore error) and the start it
sleep 1; sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh' sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh'
depend: depend:

2
docker/main/startsystem.sh
View file

@ -40,7 +40,7 @@
# See also Dockerfile of the example # See also Dockerfile of the example
# Log msg, see with docker logs # Log msg, see with docker logs
set -eux set -ux # e but clixon_backend may fail if test is run in parallell
>&2 echo "$0" >&2 echo "$0"

2
docker/main/startsystem_evhtp.sh
View file

@ -39,7 +39,7 @@
# See also Dockerfile of the example # See also Dockerfile of the example
# Log msg, see with docker logs # Log msg, see with docker logs
set -eux set -ux # e but clixon_backend may fail if test is run in parallell
>&2 echo "$0" >&2 echo "$0"

2
docker/main/startsystem_fcgi.sh
View file

@ -40,7 +40,7 @@
# See also Dockerfile of the example # See also Dockerfile of the example
# Log msg, see with docker logs # Log msg, see with docker logs
set -eux set -ux # e but clixon_backend may fail if test is run in parallell
>&2 echo "$0" >&2 echo "$0"