From f965085b985a9359a1e2f3dedffbc36f330bad67 Mon Sep 17 00:00:00 2001
From: Denis Smirnov <sd@picodata.io>
Date: Tue, 2 Aug 2022 11:42:44 +0700
Subject: [PATCH] fix(ci): update ci image to git v2
Otherwise we face an error during c-ares submodule update in make
init target.
---
.gitlab-ci.yml | 2 +-
ci/Dockerfile | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c7ed70d58..7cf28628f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ cache:
default:
tags:
- picodata
- image: docker-public.binary.picodata.io/picodata/picodata/sbroad/sbroad-builder:0.4.0
+ image: docker-public.binary.picodata.io/picodata/picodata/sbroad/sbroad-builder:0.4.1
build:
before_script:
- make init
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 24e3e4e73d..b391722ddd 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -3,7 +3,9 @@ FROM docker-public.binary.picodata.io/tarantool:2.10.0
ENV PATH=/root/.cargo/bin:${PATH}
RUN curl -L https://tarantool.io/UaooCnt/release/2/installer.sh | bash; \
- yum-config-manager --disable picodata; \
+ yum -y remove git git-*; \
+ yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm; \
+ yum install -y git; \
yum -y update && yum -y install -y wget openssl-devel cartridge-cli readline-devel libicu-devel; \
yum groupinstall -y "Development Tools"; \
yum clean all; \
--
GitLab