GitlabCI install curl and jq in base image

This commit is contained in:
Gioacchino Mazzurco 2020-04-07 21:41:12 +02:00
parent 463d46a26f
commit a95b99dcb4
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 8 additions and 9 deletions

View File

@ -29,30 +29,29 @@ build-and-test:
docker run --name retroshare --detach --tty docker run --name retroshare --detach --tty
"$CI_REGISTRY_IMAGE:testing" "$CI_REGISTRY_IMAGE:testing"
retroshare-service --jsonApiPort 9092 retroshare-service --jsonApiPort 9092
- docker exec retroshare apt-get install -y curl
- > - >
docker exec retroshare 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 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 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 docker exec retroshare
curl --verbose --data curl --verbose --data
'{ "location":{ "mLocationName":"Test 1", "mPpgName":"Test2", '{ "location":{ "mLocationName":"Test 1", "mPpgName":"Test2",
"makeHidden":false, "makeAutoTor":false }, "password":"Test 3", "makeHidden":false, "makeAutoTor":false }, "password":"Test 3",
"caller_data":"Test 5" }' "caller_data":"Test 5" }'
http://127.0.0.1:9092/rsLoginHelper/createLocation http://127.0.0.1:9092/rsLoginHelper/createLocation | jq
- > - >
docker exec retroshare 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 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 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 - docker container stop retroshare

View File

@ -23,7 +23,7 @@ RUN \
apt-get install -y build-essential libssl-dev libbz2-dev libsqlite3-dev \ apt-get install -y build-essential libssl-dev libbz2-dev libsqlite3-dev \
libsqlcipher-dev libupnp-dev pkg-config libz-dev \ libsqlcipher-dev libupnp-dev pkg-config libz-dev \
qt5-default libxapian-dev qttools5-dev doxygen rapidjson-dev \ qt5-default libxapian-dev qttools5-dev doxygen rapidjson-dev \
git cmake git cmake curl jq
ARG FRESHCLONE=0 ARG FRESHCLONE=0
ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git