Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-13 07:38:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More attempts at fixing GitlabCI

Browse source 
See https://forum.gitlab.com/t/docker-dind-stops-working-after-12-1-0-update/28664/11
This commit is contained in:
Gioacchino Mazzurco 2023-11-27 01:33:19 +01:00
parent 3f40837b1c
commit 67762c1eb0
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -1,7 +1,7 @@
image: docker:stable image: docker:latest
services: services:
- docker:stable-dind - docker:dind
stages: stages:
- build - build
@ -18,6 +18,7 @@ variables:
build-ubuntu-test-image: build-ubuntu-test-image:
stage: build stage: build
script: script:
- docker --version
- > - >
docker login "$CI_REGISTRY" docker login "$CI_REGISTRY"
--username "$CI_REGISTRY_USER" --username "$CI_REGISTRY_USER"
@ -35,6 +36,7 @@ build-ubuntu-test-image:
test-ubuntu: test-ubuntu:
stage: test stage: test
script: script:
- docker --version
- > - >
docker login "$CI_REGISTRY" docker login "$CI_REGISTRY"
--username "$CI_REGISTRY_USER" --username "$CI_REGISTRY_USER"

2
build_scripts/GitlabCI/base.Dockerfile
View file

@ -58,5 +58,5 @@ RUN \
mkdir RetroShare-build && cd RetroShare-build && \ mkdir RetroShare-build && cd RetroShare-build && \
cmake -B. -S../RetroShare/retroshare-service \ cmake -B. -S../RetroShare/retroshare-service \
-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \ -DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
make -j$(nproc) -j1 && make install && \ make -j$(nproc) && make install && \
cd .. && rm -rf RetroShare-build cd .. && rm -rf RetroShare-build