ci: switch to rocky linux 8 image

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: none
   GIT_DEPTH: 1
   BASE_IMAGE_NAME: docker-public.binary.picodata.io/sbroad-builder
-  BASE_IMAGE_TAG: latest
+  BASE_IMAGE_TAG: 0.11.0
   DOCKER_AUTH_CONFIG: $DOCKER_AUTH_RW
   FF_NETWORK_PER_BUILD: 1
   RAW_REGISTRY: $RAW_PRIVATE_REGISTRY
@@ -263,4 +263,4 @@ deploy-luarocks:
     - ssh -o stricthostkeychecking=no luarocks@94.26.239.246 "luarocks-admin make_manifest /data/nginx/www/packrepo/luarocks"
   cache:
     - <<: *cache-rocks
-      policy: pull
\ No newline at end of file
+      policy: pull

Makefile

@@ -32,7 +32,7 @@ clean:
 lint:
 	cargo fmt --all -- --check
 	cargo clippy -- --deny clippy::all
-	RUSTDOCFLAGS="-D warnings" cargo doc
+	RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
 	cargo audit -f audit.toml
 	./deps.sh
 	./.rocks/bin/luacheck .

ci/Dockerfile

@@ -3,22 +3,17 @@ FROM docker-public.binary.picodata.io/tarantool:latest
 ENV PATH=/usr/local/bin:/root/.cargo/bin:${PATH}
 ENV LD_LIBRARY_PATH=/usr/local/lib64:$LD_LIBRARY_PATH
 
-RUN yum -y remove git git-* && \
-    rm -f /etc/yum.repos.d/pg.repo && \
-    yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm && \
-    yum -y update && \
-    yum install -y git && \
-    curl -L https://tarantool.io/UaooCnt/release/2/installer.sh | bash && \
-    yum install -y wget openssl-devel cartridge-cli-2.12.2 readline-devel libicu-devel && \
-    yum groupinstall -y "Development Tools" && \
-    yum clean all && \
-    wget https://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.gz && \
-    tar -xzf gcc-4.9.2.tar.gz && cd gcc-4.9.2 && ./contrib/download_prerequisites && \
-    ./configure --enable-checking=release --enable-languages=c,c++ --disable-multilib && \
-    make && make install; cd .. && rm -rf  gcc* && \
+RUN rm -f /etc/yum.repos.d/pg.repo && \
+    dnf -y update && \
+    dnf install -y git gcc gcc-c++ make cmake golang findutils && \
+    mkdir -p $(go env GOPATH)/bin && \
+    export PATH=$(go env GOPATH)/bin:$PATH && \
+    git clone https://github.com/magefile/mage.git && \
+    cd mage && go run bootstrap.go && cd .. && rm -rf mage && \
+    git clone https://github.com/tarantool/cartridge-cli.git && \
+    cd cartridge-cli && git checkout 2.10.0 && \
+    mage build && mv ./cartridge /usr/local/bin && cd .. && rm -rf cartridge-cli && \
+    dnf install -y openssl-devel readline-devel libicu-devel && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain=1.76.0 -y --profile default && \
     rustup component add rustfmt && \
-    cargo install cargo-audit && \
-    wget https://cmake.org/files/v3.17/cmake-3.17.3.tar.gz && \
-    tar zxvf cmake-3.17.3.tar.gz && cd cmake-3.17.3 && ./configure && make && make install && \
-    cd .. && rm -rf cmake*
+    cargo install cargo-audit

ci/docker_template.stress

 # build from project dir ex: 
 #    docker build -f ci/Dockerfile.stress .
 
-FROM docker-public.binary.picodata.io/sbroad-builder:__BASE_IMAGE_TAG__
+FROM docker-public.binary.picodata.io/sbroad-builder:0.11.0
 
 ENV STRESS_TEST=""
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2.1'
 services:
 
   tarantool:
-    image: docker-public.binary.picodata.io/sbroad-builder:0.9.0
+    image: docker-public.binary.picodata.io/sbroad-builder:0.11.0
     command: bash -c "cd /sbroad && make start && make stress_init test=${test} && touch /etc/OK && sleep infinity"
     volumes:
       - "${PWD}:/sbroad"

sbroad-cartridge/sbroad-scm-1.rockspec

@@ -14,7 +14,7 @@ dependencies = {
     'tarantool',
     'lua >= 5.1',
     'cartridge == 2.10.0-1',
-    'checks'
+    'checks == 3.3.0-1',
 }
 
 build = {

sbroad-cartridge/test_app/test_app-scm-1.rockspec

@@ -7,13 +7,13 @@ source  = {
 dependencies = {
     'tarantool',
     'lua >= 5.1',
-    'checks == 3.1.0-1',
-    'cartridge == 2.7.5-1',
-    'metrics == 0.14.0-1',
-    'crud == 0.14.0-1',
-    'cartridge-cli-extensions == 1.1.1-1',
-    'luatest == 0.5.7',
-    'luacov'
+    'checks == 3.3.0-1',
+    'cartridge == 2.10.0-1',
+    'metrics == 1.2.0-1',
+    'crud == 1.5.2-1',
+    'cartridge-cli-extensions == 1.1.2-1',
+    'luatest == 1.0.1-1',
+    'luacov == 0.13.0-1'
 }
 build = {
     type = 'none';