diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c91f867a5..45fed1bb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: docker:stable +image: docker:latest services: - - docker:stable-dind + - docker:dind stages: - build @@ -18,6 +18,7 @@ variables: build-ubuntu-test-image: stage: build script: + - docker --version - > docker login "$CI_REGISTRY" --username "$CI_REGISTRY_USER" @@ -35,6 +36,7 @@ build-ubuntu-test-image: test-ubuntu: stage: test script: + - docker --version - > docker login "$CI_REGISTRY" --username "$CI_REGISTRY_USER" diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile index 014b8fb04..5fd1bd81d 100644 --- a/build_scripts/GitlabCI/base.Dockerfile +++ b/build_scripts/GitlabCI/base.Dockerfile @@ -58,5 +58,5 @@ RUN \ mkdir RetroShare-build && cd RetroShare-build && \ cmake -B. -S../RetroShare/retroshare-service \ -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