diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c7ed70d58d7bc39cf33cae153fd19396501910a..7cf28628f48ca437b8d710a6420a020cbe6c6a4e 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 24e3e4e73dcaf832b77c50ac555a37f06f68e92a..b391722ddd04f7b8b51fa12f55de9f043e522db9 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; \