diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0f93c4e..4be9fc5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: env: TARANTOOL_SERVER_USER: root TARANTOOL_SERVER_GROUP: root - TARANTOOL_VERSION: "2.11.2-centos7" + TARANTOOL_VERSION: "2.11.2-ubuntu20.04" run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml - name: Upload jacoco exec results @@ -73,7 +73,7 @@ jobs: timeout-minutes: 25 strategy: matrix: - tarantool-version: [ "1.x-centos7", "2.11.2-centos7", "3.0.1" ] + tarantool-version: [ "1.x-centos7", "2.11.2-ubuntu20.04", "3.0.1" ] fail-fast: false steps: - uses: actions/checkout@v4 @@ -103,6 +103,7 @@ jobs: needs: - tests-cartridge-container - tests-ee + - tests-tarantool-container runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 08e6971..7fa1912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [1.3.1] - 2024-02-13 + +- 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. + ## [1.3.0] - 2024-02-02 - Change `TARANTOOL_VERSION` semantic. Now it's expected to be a full tag, not prefix of centos version. diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainer.java b/src/main/java/org/testcontainers/containers/TarantoolContainer.java index 98d48a6..7190ae4 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolContainer.java +++ b/src/main/java/org/testcontainers/containers/TarantoolContainer.java @@ -18,7 +18,7 @@ public class TarantoolContainer extends GenericContainer implements TarantoolContainerOperations { public static final String TARANTOOL_IMAGE = "tarantool/tarantool"; - public static final String DEFAULT_IMAGE_VERSION = "2.11.2-centos7"; + public static final String DEFAULT_IMAGE_VERSION = "2.11.2-ubuntu20.04"; public static final String DEFAULT_TARANTOOL_BASE_IMAGE = String.format("%s:%s", TARANTOOL_IMAGE, DEFAULT_IMAGE_VERSION); diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 31ae023..f928e09 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,17 +1,16 @@ -ARG TARANTOOL_VERSION=2.11.2-centos7 +ARG TARANTOOL_VERSION=2.11.2-ubuntu20.04 FROM tarantool/tarantool:${TARANTOOL_VERSION} AS cartridge-base -# system preparations because docker mount directory as a root ARG TARANTOOL_SERVER_USER="root" ARG TARANTOOL_SERVER_GROUP="root" USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true # install dependencies -# a yum bug requires setting ulimit, see https://bugzilla.redhat.com/show_bug.cgi?id=1537564 RUN ulimit -n 1024 && \ - yum -y install cmake make gcc gcc-c++ git unzip cartridge-cli && \ - yum clean all + apt-get -y update && \ + apt-get -y install build-essential cmake make gcc git unzip cartridge-cli && \ + apt-get -y clean RUN cartridge version # build and run @@ -31,6 +30,7 @@ ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR ENV TARANTOOL_LOGDIR=$TARANTOOL_LOGDIR ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE ENV TARANTOOL_CLUSTER_COOKIE=$TARANTOOL_CLUSTER_COOKIE +ENV CMAKE_DUMMY_WEBUI="YES" COPY $CARTRIDGE_SRC_DIR $TARANTOOL_WORKDIR WORKDIR $TARANTOOL_WORKDIR