diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db01a17b3..bae14127e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,30 +29,29 @@ build-and-test: docker run --name retroshare --detach --tty "$CI_REGISTRY_IMAGE:testing" retroshare-service --jsonApiPort 9092 - - docker exec retroshare apt-get install -y curl - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/jsonApiServer/version + curl --verbose http://127.0.0.1:9092/jsonApiServer/version | jq - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList + curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList | jq - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations + curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations | jq - > docker exec retroshare curl --verbose --data '{ "location":{ "mLocationName":"Test 1", "mPpgName":"Test2", "makeHidden":false, "makeAutoTor":false }, "password":"Test 3", "caller_data":"Test 5" }' - http://127.0.0.1:9092/rsLoginHelper/createLocation + http://127.0.0.1:9092/rsLoginHelper/createLocation | jq - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations + curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations | jq - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/rsLoginHelper/isLoggedIn + curl --verbose http://127.0.0.1:9092/rsLoginHelper/isLoggedIn | jq - > docker exec retroshare - curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList + curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList | jq - docker container stop retroshare diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile index d39f00a12..e4d5fbb74 100644 --- a/build_scripts/GitlabCI/base.Dockerfile +++ b/build_scripts/GitlabCI/base.Dockerfile @@ -23,7 +23,7 @@ RUN \ apt-get install -y build-essential libssl-dev libbz2-dev libsqlite3-dev \ libsqlcipher-dev libupnp-dev pkg-config libz-dev \ qt5-default libxapian-dev qttools5-dev doxygen rapidjson-dev \ - git cmake + git cmake curl jq ARG FRESHCLONE=0 ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git