From add40776bd7bba72e8f8d5b0a751a7aecc77f4c4 Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 17:34:13 +0000
Subject: [PATCH] Fix ci after moving to the on-premise gitlab
---
.gitlab-ci.yml | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd6e483811..69ffd0f676 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,8 @@ 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
#
# See also:
@@ -31,35 +33,30 @@ docker-build-base:
stage: prebuild
image: docker:20
tags:
- - picodata
- - docker
+ - dind
rules:
- # if
changes:
- docker-build-base/Dockerfile
before_script:
- - >
- echo -n ${CI_REGISTRY_PASSWORD} | docker login
- -u ${CI_REGISTRY_USER}
- --password-stdin
- ${CI_REGISTRY}
+ - mkdir -p $HOME/.docker
+ - echo $DOCKER_AUTH_RW > $HOME/.docker/config.json
script:
- - docker pull ${CI_REGISTRY_IMAGE}/${BASE_IMAGE} || true
+ - docker pull ${REGISTRY_IMAGE}/${BASE_IMAGE} || true
- >
docker build
--pull
--label GIT_COMMIT=${CI_COMMIT_SHA}
- --cache-from ${CI_REGISTRY_IMAGE}/${BASE_IMAGE}
- -t ${CI_REGISTRY_IMAGE}/${BASE_IMAGE}
+ --cache-from ${REGISTRY_IMAGE}/${BASE_IMAGE}
+ -t ${REGISTRY_IMAGE}/${BASE_IMAGE}
-f ./docker-build-base/Dockerfile
./docker-build-base
- - docker push ${CI_REGISTRY_IMAGE}/${BASE_IMAGE}
+ - docker push ${REGISTRY_IMAGE}/${BASE_IMAGE}
build:
- image: ${CI_REGISTRY_IMAGE}/${BASE_IMAGE}
+ image: ${REGISTRY_IMAGE}/${BASE_IMAGE}
stage: build
tags:
- - picodata
- docker
script:
# - git submodule foreach --recursive 'git fetch --tags; git describe --always'
--
GitLab