From 76e06d725f849bc76b7df1ff85bca77b8b4092a9 Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 15:51:43 +0300
Subject: [PATCH 1/5] fix ci
---
.gitlab-ci.yml | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd6e483811..75a0316976 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,27 @@ docker-build-base:
stage: prebuild
image: docker:20
tags:
- - picodata
- docker
- rules:
- - # if
- changes:
- - docker-build-base/Dockerfile
- before_script:
- - >
- echo -n ${CI_REGISTRY_PASSWORD} | docker login
- -u ${CI_REGISTRY_USER}
- --password-stdin
- ${CI_REGISTRY}
+ # rules:
+ # - # if
+ # changes:
+ # - docker-build-base/Dockerfile
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
From 3d70c4b778da6e4c4f3ef4e8de32be01c65a7f20 Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 15:53:12 +0300
Subject: [PATCH 2/5] ci test
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75a0316976..26118abb1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ stages:
- prebuild
- build
-workflow:
- rules:
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+# workflow:
+# rules:
+# - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+# - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
variables:
GIT_DEPTH: 0
--
GitLab
From 80e6a2ac482201b6242df73351d321a1bf0e6be9 Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 16:52:17 +0300
Subject: [PATCH 3/5] ci test
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26118abb1b..1cdcd2c647 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ docker-build-base:
stage: prebuild
image: docker:20
tags:
- - docker
+ - dind
# rules:
# - # if
# changes:
--
GitLab
From 4ba41e669c8f98e5596f425cce72581a1dbae61b Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 17:11:10 +0300
Subject: [PATCH 4/5] ci test
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cdcd2c647..01bfb784c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,9 @@ docker-build-base:
# - # if
# changes:
# - docker-build-base/Dockerfile
+ before_script:
+ - mkdir -p $HOME/.docker
+ - echo $DOCKER_AUTH_RW > $HOME/.docker/config.json
script:
- docker pull ${REGISTRY_IMAGE}/${BASE_IMAGE} || true
- >
--
GitLab
From d9c28d64b8da64bf9178d7d7fbb3d14b8fcf85ec Mon Sep 17 00:00:00 2001
From: Alexey Protsenko <a.protsenko@picodata.io>
Date: Wed, 6 Apr 2022 17:26:52 +0300
Subject: [PATCH 5/5] fix ci
---
.gitlab-ci.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01bfb784c7..69ffd0f676 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ stages:
- prebuild
- build
-# workflow:
-# rules:
-# - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-# - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+workflow:
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
variables:
GIT_DEPTH: 0
@@ -34,10 +34,10 @@ docker-build-base:
image: docker:20
tags:
- dind
- # rules:
- # - # if
- # changes:
- # - docker-build-base/Dockerfile
+ rules:
+ - # if
+ changes:
+ - docker-build-base/Dockerfile
before_script:
- mkdir -p $HOME/.docker
- echo $DOCKER_AUTH_RW > $HOME/.docker/config.json
--
GitLab