Merge branch 'master' of ssh://git.andreafazzi.eu:10022/andrea/oef
This commit is contained in:
commit
465f25e4f5
4 changed files with 10 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -21,8 +21,8 @@ test:
|
|||
|
||||
regression_test:
|
||||
go build .
|
||||
docker-compose -f docker/oef_regression_test/docker-compose.yaml down
|
||||
docker-compose -f docker/oef_regression_test/docker-compose.yaml up --build -d
|
||||
./bash/wait_until_up.bash oef_regression_test
|
||||
cd regression_test && make
|
||||
|
||||
all: prod
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
0.3.3-27-ge8a345b-master
|
||||
0.3.3-26-gbb7aaa4-master
|
||||
|
|
8
bash/wait_until_up.bash
Executable file
8
bash/wait_until_up.bash
Executable file
|
@ -0,0 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
until [ "`/usr/bin/docker inspect -f {{.State.Running}} $1`"=="true" ]; do
|
||||
echo "Waiting for $1 to go up..."
|
||||
sleep 0.1;
|
||||
done;
|
||||
|
||||
# docker logs --tail 100 -f $1
|
Loading…
Reference in a new issue