File tree Expand file tree Collapse file tree 4 files changed +13
-8
lines changed
java/org/testcontainers/containers Expand file tree Collapse file tree 4 files changed +13
-8
lines changed Original file line number Diff line number Diff line change 3232 env :
3333 TARANTOOL_SERVER_USER : root
3434 TARANTOOL_SERVER_GROUP : root
35- TARANTOOL_VERSION : " 2.11.2-centos7 "
35+ TARANTOOL_VERSION : " 2.11.2-ubuntu20.04 "
3636 run : ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml
3737
3838 - name : Upload jacoco exec results
7373 timeout-minutes : 25
7474 strategy :
7575 matrix :
76- tarantool-version : [ "1.x-centos7", "2.11.2-centos7 ", "3.0.1" ]
76+ tarantool-version : [ "1.x-centos7", "2.11.2-ubuntu20.04 ", "3.0.1" ]
7777 fail-fast : false
7878 steps :
7979 - uses : actions/checkout@v4
@@ -103,6 +103,7 @@ jobs:
103103 needs :
104104 - tests-cartridge-container
105105 - tests-ee
106+ - tests-tarantool-container
106107 runs-on : ubuntu-latest
107108 steps :
108109 - uses : actions/checkout@v4
Original file line number Diff line number Diff line change 22
33## [ Unreleased]
44
5+ ## [ 1.3.1] - 2024-02-13
6+
7+ - Change ` TARANTOOL_VERSION ` default value from ` 2.11.2-centos7 ` to ` 2.11.2-ubuntu20.04 ` . It ruins rocks building due to certificate issues on centos.
8+
59## [ 1.3.0] - 2024-02-02
610
711- Change ` TARANTOOL_VERSION ` semantic. Now it's expected to be a full tag, not prefix of centos version.
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ public class TarantoolContainer extends GenericContainer<TarantoolContainer>
1818 implements TarantoolContainerOperations <TarantoolContainer > {
1919
2020 public static final String TARANTOOL_IMAGE = "tarantool/tarantool" ;
21- public static final String DEFAULT_IMAGE_VERSION = "2.11.2-centos7 " ;
21+ public static final String DEFAULT_IMAGE_VERSION = "2.11.2-ubuntu20.04 " ;
2222 public static final String DEFAULT_TARANTOOL_BASE_IMAGE = String .format ("%s:%s" , TARANTOOL_IMAGE , DEFAULT_IMAGE_VERSION );
2323
2424
Original file line number Diff line number Diff line change 1- ARG TARANTOOL_VERSION=2.11.2-centos7
1+ ARG TARANTOOL_VERSION=2.11.2-ubuntu20.04
22FROM tarantool/tarantool:${TARANTOOL_VERSION} AS cartridge-base
33
4- # system preparations because docker mount directory as a root
54ARG TARANTOOL_SERVER_USER="root"
65ARG TARANTOOL_SERVER_GROUP="root"
76USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP
87RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true
98
109# install dependencies
11- # a yum bug requires setting ulimit, see https://bugzilla.redhat.com/show_bug.cgi?id=1537564
1210RUN ulimit -n 1024 && \
13- yum -y install cmake make gcc gcc-c++ git unzip cartridge-cli && \
14- yum clean all
11+ apt-get -y update && \
12+ apt-get -y install build-essential cmake make gcc git unzip cartridge-cli && \
13+ apt-get -y clean
1514RUN cartridge version
1615
1716# build and run
@@ -31,6 +30,7 @@ ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR
3130ENV TARANTOOL_LOGDIR=$TARANTOOL_LOGDIR
3231ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE
3332ENV TARANTOOL_CLUSTER_COOKIE=$TARANTOOL_CLUSTER_COOKIE
33+ ENV CMAKE_DUMMY_WEBUI="YES"
3434COPY $CARTRIDGE_SRC_DIR $TARANTOOL_WORKDIR
3535WORKDIR $TARANTOOL_WORKDIR
3636
You can’t perform that action at this time.
0 commit comments