Skip to content

Commit 3029a19

Browse files
authored
Change TARANTOOL_VERSION default value (#118)
Change TARANTOOL_VERSION default value Change TARANTOOL_VERSION default value from 2.11.2-centos7 to 2.11.2-ubuntu20.04. It ruined rocks building due to certificate issues on centos. Closes #119
1 parent 699237d commit 3029a19

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
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
@@ -73,7 +73,7 @@ jobs:
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

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
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.

src/main/java/org/testcontainers/containers/TarantoolContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

src/main/resources/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
ARG TARANTOOL_VERSION=2.11.2-centos7
1+
ARG TARANTOOL_VERSION=2.11.2-ubuntu20.04
22
FROM tarantool/tarantool:${TARANTOOL_VERSION} AS cartridge-base
33

4-
# system preparations because docker mount directory as a root
54
ARG TARANTOOL_SERVER_USER="root"
65
ARG TARANTOOL_SERVER_GROUP="root"
76
USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP
87
RUN 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
1210
RUN 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
1514
RUN cartridge version
1615

1716
# build and run
@@ -31,6 +30,7 @@ ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR
3130
ENV TARANTOOL_LOGDIR=$TARANTOOL_LOGDIR
3231
ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE
3332
ENV TARANTOOL_CLUSTER_COOKIE=$TARANTOOL_CLUSTER_COOKIE
33+
ENV CMAKE_DUMMY_WEBUI="YES"
3434
COPY $CARTRIDGE_SRC_DIR $TARANTOOL_WORKDIR
3535
WORKDIR $TARANTOOL_WORKDIR
3636

0 commit comments

Comments
 (0)