Skip to content
Snippets Groups Projects
Commit add40776 authored by Alexey Protsenko's avatar Alexey Protsenko Committed by Yaroslav Dynnikov
Browse files

Fix ci after moving to the on-premise gitlab

parent 0a132cbc
No related branches found
No related tags found
1 merge request!67fix ci
Pipeline #3698 passed
...@@ -13,6 +13,8 @@ variables: ...@@ -13,6 +13,8 @@ variables:
BASE_IMAGE: build-base:latest BASE_IMAGE: build-base:latest
CARGO_INCREMENTAL: 0 CARGO_INCREMENTAL: 0
CARGO_HOME: ${CI_PROJECT_DIR}/.cargo CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
DOCKER_AUTH_CONFIG: $DOCKER_AUTH_RW
REGISTRY_IMAGE: docker-public.binary.picodata.io
# #
# See also: # See also:
...@@ -31,35 +33,30 @@ docker-build-base: ...@@ -31,35 +33,30 @@ docker-build-base:
stage: prebuild stage: prebuild
image: docker:20 image: docker:20
tags: tags:
- picodata - dind
- docker
rules: rules:
- # if - # if
changes: changes:
- docker-build-base/Dockerfile - docker-build-base/Dockerfile
before_script: before_script:
- > - mkdir -p $HOME/.docker
echo -n ${CI_REGISTRY_PASSWORD} | docker login - echo $DOCKER_AUTH_RW > $HOME/.docker/config.json
-u ${CI_REGISTRY_USER}
--password-stdin
${CI_REGISTRY}
script: script:
- docker pull ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} || true - docker pull ${REGISTRY_IMAGE}/${BASE_IMAGE} || true
- > - >
docker build docker build
--pull --pull
--label GIT_COMMIT=${CI_COMMIT_SHA} --label GIT_COMMIT=${CI_COMMIT_SHA}
--cache-from ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} --cache-from ${REGISTRY_IMAGE}/${BASE_IMAGE}
-t ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} -t ${REGISTRY_IMAGE}/${BASE_IMAGE}
-f ./docker-build-base/Dockerfile -f ./docker-build-base/Dockerfile
./docker-build-base ./docker-build-base
- docker push ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} - docker push ${REGISTRY_IMAGE}/${BASE_IMAGE}
build: build:
image: ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} image: ${REGISTRY_IMAGE}/${BASE_IMAGE}
stage: build stage: build
tags: tags:
- picodata
- docker - docker
script: script:
# - git submodule foreach --recursive 'git fetch --tags; git describe --always' # - git submodule foreach --recursive 'git fetch --tags; git describe --always'
......
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