Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 13:48:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

GitlabCI install jq in outer docker image where it is executed

Browse source 
Export needed variable that is missing in merge requests
This commit is contained in:
Gioacchino Mazzurco 2020-04-08 01:58:57 +02:00
parent 4890411964
commit ac11ae9a40
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -10,17 +10,18 @@ workflow:
build-and-test: build-and-test:
script: script:
- mkdir Dockercontext
- > - >
docker login "$CI_REGISTRY" docker login "$CI_REGISTRY"
--username "$CI_REGISTRY_USER" --password "$CI_REGISTRY_PASSWORD" --username "$CI_REGISTRY_USER" --password "$CI_REGISTRY_PASSWORD"
- docker pull "$CI_REGISTRY_IMAGE:base"
- > - >
if [ -n "$CI_MERGE_REQUEST_ID" ]; then if [ -n "$CI_MERGE_REQUEST_ID" ]; then
MR_ARGS="--build-arg REPO_URL=$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ; MR_ARGS="--build-arg REPO_URL=$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ;
MR_ARGS="$MR_ARGS --build-arg REPO_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ; MR_ARGS="$MR_ARGS --build-arg REPO_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ;
export MR_ARGS ; export MR_ARGS ;
export CI_REGISTRY_IMAGE="retroshare" ;
fi fi
- docker pull "$CI_REGISTRY_IMAGE:base"
- mkdir Dockercontext
- > - >
docker build -t "$CI_REGISTRY_IMAGE:testing" $MR_ARGS docker build -t "$CI_REGISTRY_IMAGE:testing" $MR_ARGS
--file /builds/RetroShare/RetroShare/build_scripts/GitlabCI/gitlabCI.Dockerfile --file /builds/RetroShare/RetroShare/build_scripts/GitlabCI/gitlabCI.Dockerfile
@ -29,7 +30,7 @@ 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 which jq - apk add jq
- > - >
docker exec retroshare docker exec retroshare
curl --verbose http://127.0.0.1:9092/rsJsonApi/version | jq curl --verbose http://127.0.0.1:9092/rsJsonApi/version | jq

2
build_scripts/GitlabCI/base.Dockerfile
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 curl jq git cmake curl
ARG FRESHCLONE=0 ARG FRESHCLONE=0
ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git