mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-25 23:45:49 -04:00
GitlabCI remove unuseful steps and fix variable
This commit is contained in:
parent
490ac43d02
commit
5f85a897ba
1 changed files with 3 additions and 9 deletions
|
@ -10,25 +10,19 @@ workflow:
|
||||||
|
|
||||||
build-and-test:
|
build-and-test:
|
||||||
script:
|
script:
|
||||||
- >
|
|
||||||
docker login "$CI_REGISTRY"
|
|
||||||
--username "$CI_REGISTRY_USER" --password "$CI_REGISTRY_PASSWORD"
|
|
||||||
- >
|
- >
|
||||||
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="registry.gitlab.com/retroshare/retroshare" ;
|
|
||||||
fi
|
fi
|
||||||
- docker pull "$CI_REGISTRY_IMAGE:base"
|
|
||||||
- mkdir Dockercontext
|
- mkdir Dockercontext
|
||||||
- >
|
- >
|
||||||
docker build -t "$CI_REGISTRY_IMAGE:testing" $MR_ARGS
|
docker build -t retroshare:testing $MR_ARGS
|
||||||
--file /builds/RetroShare/RetroShare/build_scripts/GitlabCI/gitlabCI.Dockerfile
|
--file /builds/$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH/build_scripts/GitlabCI/gitlabCI.Dockerfile
|
||||||
Dockercontext
|
Dockercontext
|
||||||
- >
|
- >
|
||||||
docker run --name retroshare --detach --tty
|
docker run --name retroshare --detach --tty retroshare:testing
|
||||||
"$CI_REGISTRY_IMAGE:testing"
|
|
||||||
retroshare-service --jsonApiPort 9092
|
retroshare-service --jsonApiPort 9092
|
||||||
- apk add jq
|
- apk add jq
|
||||||
- >
|
- >
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue