Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ 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

- name: Set up JDK 1.8
uses: actions/setup-java@v5
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '8'
cache: 'maven'

Expand All @@ -43,7 +41,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
Expand All @@ -63,15 +61,15 @@ 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

- name: Set up JDK 1.8
uses: actions/setup-java@v5
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '8'
cache: 'maven'

Expand Down Expand Up @@ -109,7 +107,7 @@ jobs:
- name: Set up JDK 1.8
uses: actions/setup-java@v5
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '8'
cache: 'maven'

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [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
- Bump various maven plugins
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class TarantoolContainer extends GenericContainer<TarantoolContainer>
implements TarantoolContainerOperations<TarantoolContainer> {

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);


Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down