diff --git a/.circleci/config.yml b/.circleci/config.yml index ce8503fd..46364c77 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,6 +90,12 @@ jobs: name: Set Up ArangoDB command: ./starter.sh << parameters.arangodb_config >> << parameters.arangodb_license >> << parameters.arangodb_version >> + - run: docker ps -a + + - run: sleep 10 + + - run: docker logs adb + # - restore_cache: # key: pip-and-local-cache @@ -105,10 +111,6 @@ jobs: # name: "Install Dependencies" # command: pip install -e .[dev] - - run: docker ps -a - - - run: docker logs arango - # - run: # name: "Run pytest" # command: | diff --git a/starter.sh b/starter.sh index 71a8715f..47800a40 100755 --- a/starter.sh +++ b/starter.sh @@ -39,11 +39,9 @@ else conf_file="${setup}" fi -docker run -d --rm \ - --name arango \ - -p 8528:8528 \ - -p 8529:8529 \ - "arangodb/$image_name:$version" +docker run -d --rm --name adb -p 8529:8529 arangodb/arangodb:latest + +docker ps -a # docker run -d --rm \ # --name arango \ @@ -55,11 +53,11 @@ docker run -d --rm \ # "arangodb/$image_name:$version" # /bin/sh -c "arangodb --configuration=/tests/static/$conf_file.conf" -wget --quiet --waitretry=1 --tries=120 -O - http://localhost:8528/version | jq -if [ $? -eq 0 ]; then - echo "OK starter ready" - exit 0 -else - echo "ERROR starter not ready, giving up" - exit 1 -fi +# wget --quiet --waitretry=1 --tries=120 -O - http://localhost:8528/version | jq +# if [ $? -eq 0 ]; then +# echo "OK starter ready" +# exit 0 +# else +# echo "ERROR starter not ready, giving up" +# exit 1 +# fi