From e531e961016c0f9e3ef3bacd0ddc0f43ab4da243 Mon Sep 17 00:00:00 2001 From: Dmitry Kasimovskiy Date: Tue, 18 Nov 2025 15:00:33 +0300 Subject: [PATCH 1/3] chore(ci): bump tarantool 2.x default docker image - Bump Tarantool 2.x default docker image from 2.11.2-ubuntu20.04 to 2.11.8-ubuntu20.04 --- .github/workflows/tests.yml | 4 ++-- CHANGELOG.md | 2 ++ .../org/testcontainers/containers/TarantoolContainer.java | 2 +- src/main/resources/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a741430..f4a42f0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,7 +43,7 @@ jobs: env: TARANTOOL_SERVER_USER: root TARANTOOL_SERVER_GROUP: root - TARANTOOL_VERSION: "2.11.2-ubuntu20.04" + TARANTOOL_VERSION: "2.11.8-ubuntu20.04" run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml - name: Print system images @@ -63,7 +63,7 @@ jobs: timeout-minutes: 25 strategy: matrix: - tarantool-version: [ "1.x-centos7", "2.11.2-ubuntu20.04", "3.0.1-old" ] + tarantool-version: [ "1.x-centos7", "2.11.8-ubuntu20.04", "3.0.1-old" ] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index d2b2926..9462917 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +- Change `TARANTOOL_VERSION` default value from `2.11.2-ubuntu20.04` to `2.11.8-ubuntu20.04` + ## [1.4.1] - 2025-11-07 - Bump httpclient from 4.5.14 to httpclient5 5.5.1 - Bump various maven plugins diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainer.java b/src/main/java/org/testcontainers/containers/TarantoolContainer.java index 0e42d9d..38d2269 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 DEFAULT_IMAGE = "tarantool/tarantool"; - public static final String DEFAULT_TAG = "2.11.2-ubuntu20.04"; + public static final String DEFAULT_TAG = "2.11.8-ubuntu20.04"; public static final String DEFAULT_BASE_IMAGE = String.format("%s:%s", DEFAULT_IMAGE, DEFAULT_TAG); diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index b4511cb..ff4cabc 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,5 +1,5 @@ ARG IMAGE="tarantool/tarantool" -ARG TARANTOOL_VERSION="2.11.2-ubuntu20.04" +ARG TARANTOOL_VERSION="2.11.8-ubuntu20.04" FROM $IMAGE:$TARANTOOL_VERSION AS cartridge-base ARG TARANTOOL_SERVER_USER="root" From d7037c544f8a57008618a47abe76972e4cade811 Mon Sep 17 00:00:00 2001 From: Dmitry Kasimovskiy Date: Tue, 18 Nov 2025 15:44:31 +0300 Subject: [PATCH 2/3] chore(ci): change JDK distribution - Change JDK distribution from Zulu to Temurin --- .github/workflows/prepare_release.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 2 +- .github/workflows/tests.yml | 6 +++--- CHANGELOG.md | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 0ac35be..28cc8e3 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -24,7 +24,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30c2391..ea8d09d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' server-id: central diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index dda789f..be93587 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -18,7 +18,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' server-id: central-portal-snapshots diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f4a42f0..b76cde5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: - name: Set up JDK 1.8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' @@ -71,7 +71,7 @@ jobs: - name: Set up JDK 1.8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' @@ -109,7 +109,7 @@ jobs: - name: Set up JDK 1.8 uses: actions/setup-java@v5 with: - distribution: 'zulu' + distribution: 'temurin' java-version: '8' cache: 'maven' diff --git a/CHANGELOG.md b/CHANGELOG.md index 9462917..8bdd121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] - Change `TARANTOOL_VERSION` default value from `2.11.2-ubuntu20.04` to `2.11.8-ubuntu20.04` +- CI/CD: Change JDK distribution from Zulu to Temurin ## [1.4.1] - 2025-11-07 - Bump httpclient from 4.5.14 to httpclient5 5.5.1 From 9e825f9a0362fb4707a4e19ff16a948d9ebd9cf2 Mon Sep 17 00:00:00 2001 From: Dmitry Kasimovskiy Date: Wed, 26 Nov 2025 18:25:47 +0300 Subject: [PATCH 3/3] chore(ci): change JDK distribution - Change JDK distribution from Zulu to Temurin --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b76cde5..3620ab3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,8 +18,6 @@ jobs: if: "!contains(github.event.head_commit.message, '[maven-release-plugin]')" runs-on: ubuntu-latest timeout-minutes: 25 - strategy: - fail-fast: false steps: - uses: actions/checkout@v4