Skip to content
Snippets Groups Projects
Verified Commit d1e73853 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CI] Use ogs group registry.

parent 8074d88a
No related branches found
No related tags found
No related merge requests found
...@@ -8,10 +8,10 @@ stages: ...@@ -8,10 +8,10 @@ stages:
variables: variables:
# Docker image names # Docker image names
CONTAINER_GCC_IMAGE: $CI_REGISTRY_IMAGE/gcc:$CI_COMMIT_REF_SLUG CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc:$CI_COMMIT_REF_SLUG
CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY_IMAGE/gcc-gui:$CI_COMMIT_REF_SLUG CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc-gui:$CI_COMMIT_REF_SLUG
XUNIT_TO_JUNIT_IMAGE: registry.gitlab.com/opengeosys/ogs/xunit-to-junit XUNIT_TO_JUNIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/xunit-to-junit
PRECOMMIT_IMAGE: registry.gitlab.com/opengeosys/ogs/pre-commit PRECOMMIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/pre-commit
# Build config # Build config
BUILD_TYPE: Release BUILD_TYPE: Release
BUILD_PROCESSES: "" # Empty string: builds all processes BUILD_PROCESSES: "" # Empty string: builds all processes
......
...@@ -4,6 +4,8 @@ build gcc images: ...@@ -4,6 +4,8 @@ build gcc images:
- changes: - changes:
- ThirdParty/container-maker - ThirdParty/container-maker
- scripts/ci/jobs/build_image.yml - scripts/ci/jobs/build_image.yml
- if: '$CI_COMMIT_BRANCH == "master"'
when: always
tags: tags:
- docker-shell - docker-shell
- ogs - ogs
...@@ -11,7 +13,7 @@ build gcc images: ...@@ -11,7 +13,7 @@ build gcc images:
GIT_LFS_SKIP_SMUDGE: "1" GIT_LFS_SKIP_SMUDGE: "1"
extends: .container-maker-setup extends: .container-maker-setup
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $OGS_CI_REGISTRY_USER -p $OGS_CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $CONTAINER_GCC_IMAGE:latest || true - docker pull $CONTAINER_GCC_IMAGE:latest || true
- python ThirdParty/container-maker/ogscm/cli.py --build --gitlab - python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
--ogs off --pm system --cvode --cppcheck --docs --gcovr --ogs off --pm system --cvode --cppcheck --docs --gcovr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment