diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13a997fb78d20508730ceb8fcfbe178985e88f30..0f04e080d2413eee35712d3a572ec431099a6a8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,11 @@ stages: - sign - deploy -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - if: $CI_PIPELINE_SOURCE == "web" +#workflow: +# rules: +# - if: $CI_PIPELINE_SOURCE == "merge_request_event" +# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH +# - if: $CI_PIPELINE_SOURCE == "web" variables: GIT_DEPTH: 0 @@ -19,7 +19,6 @@ variables: BASE_IMAGE: build-base:latest CARGO_INCREMENTAL: 0 CARGO_HOME: ${CI_PROJECT_DIR}/.cargo - DOCKER_AUTH_CONFIG: $DOCKER_AUTH_RW REGISTRY_IMAGE: docker-public.binary.picodata.io RAW_REGISTRY: https://binary.picodata.io/repository/raw-private/ @@ -43,13 +42,14 @@ docker-build-base: tags: - dind rules: - - # if + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH changes: - docker-build-base/Dockerfile before_script: - mkdir -p $CI_PROJECT_DIR/.docker - echo $DOCKER_AUTH_RW > $CI_PROJECT_DIR/.docker/config.json script: + - sleep infinity - docker pull ${REGISTRY_IMAGE}/${BASE_IMAGE} || true - > docker build