diff --git a/.github/workflows/README.md b/.github/workflows/README.md
new file mode 100644
index 0000000..c2539d0
--- /dev/null
+++ b/.github/workflows/README.md
@@ -0,0 +1,60 @@
+# GitHub Actions Workflows
+
+This directory contains the GitHub Actions workflows for the project.
+
+## Workflows
+
+### 1. tests.yml
+- **Trigger**: Push to master branch or pull requests to master
+- **Purpose**: Run all tests (unit and integration) on multiple Tarantool versions
+- **Runs on**: Ubuntu latest
+
+### 2. release.yml
+- **Trigger**: Creation of tags matching semantic versioning pattern (e.g., `1.4.1`, `2.0.1`)
+- **Purpose**: Automatically release to Maven Central and create GitHub Release
+- **Runs on**: Ubuntu latest
+- **Requires secrets**:
+ - `OSSRH_USERNAME` - Sonatype OSSRH username
+ - `OSSRH_TOKEN` - Sonatype OSSRH password or token
+ - `MAVEN_GPG_PRIVATE_KEY` - GPG private key for signing artifacts
+ - `MAVEN_GPG_PASSPHRASE` - Passphrase for the GPG key
+ - `TARANTOOL_REGISTRY_PASSWORD` - Password for Tarantool private registry
+
+### 3. snapshot.yml
+- **Trigger**: Push to master branch (except commits starting with "Release")
+- **Purpose**: Automatically deploy snapshot versions to Maven Central
+- **Runs on**: Ubuntu latest
+- **Requires secrets**:
+ - `OSSRH_USERNAME` - Sonatype OSSRH username
+ - `OSSRH_TOKEN` - Sonatype OSSRH password or token
+ - `TARANTOOL_REGISTRY_PASSWORD` - Password for Tarantool private registry
+
+## Setup Instructions
+
+To enable automatic releases, you need to configure the following secrets in your GitHub repository settings:
+
+1. Go to Settings → Secrets and variables → Actions
+2. Add the following secrets:
+ - `OSSRH_USERNAME` - Your Sonatype OSSRH username
+ - `OSSRH_TOKEN` - Your Sonatype OSSRH token/password
+ - `MAVEN_GPG_PRIVATE_KEY` - Your GPG private key (export with `gpg --export-secret-keys --armor KEY_ID`)
+ - `MAVEN_GPG_PASSPHRASE` - Passphrase for your GPG key
+ - `TARANTOOL_REGISTRY_PASSWORD` - Password for the Tarantool private registry
+
+## Release Process
+
+### Automatic Release
+1. Create and push a new tag with semantic versioning format (e.g., `git tag 1.4.1 && git push origin 1.4.1`)
+2. The release workflow will automatically:
+ - Build and test the project
+ - Sign the artifacts with GPG
+ - Deploy to Maven Central
+ - Create a GitHub Release
+
+### Automatic Snapshot Deployment
+1. Push changes to the master branch
+2. The snapshot workflow will automatically:
+ - Build and test the project
+ - Deploy snapshot version to Maven Central
+
+Note: Commits with messages starting with "Release" are excluded from snapshot deployment to avoid duplicate deployments during the release process.
diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml
new file mode 100644
index 0000000..0ac35be
--- /dev/null
+++ b/.github/workflows/prepare_release.yml
@@ -0,0 +1,45 @@
+name: Prepare Release to Maven Central
+
+on:
+ workflow_dispatch:
+ inputs:
+ releaseVersion:
+ description: 'Release and tag version'
+ required: true
+ default: "v1.5.0"
+ developmentVersion:
+ description: 'Version to use for new working copy'
+ required: true
+ default: '2.0.0-SNAPSHOT'
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v5
+ with:
+ ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+ - name: Set up JDK 8
+ uses: actions/setup-java@v5
+ with:
+ distribution: 'zulu'
+ java-version: '8'
+ cache: 'maven'
+
+ - name: Configure Git user
+ run: |
+ git config user.email "actions@github.com"
+ git config user.name "GitHub Actions"
+
+ - name: Run release release.yml
+ env:
+ GITHUB_ACTOR: ${{ github.actor }}
+ GITHUB_TOKEN: ${{ github.token }}
+ RELEASE_VERSION: ${{ github.event.inputs.releaseVersion }}
+ DEVELOPMENT_VERSION: ${{ github.event.inputs.developmentVersion }}
+ run: |
+ ./mvnw release:prepare -DskipTests -Darguments=-DskipTests \
+ -DreleaseVersion="$RELEASE_VERSION" -Dtag="$RELEASE_VERSION" \
+ -DdevelopmentVersion="$DEVELOPMENT_VERSION"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..30c2391
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,33 @@
+name: Publish Release to Maven Central
+
+on:
+ push:
+ tags:
+ - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v5
+
+ - name: Set up JDK 8
+ uses: actions/setup-java@v5
+ with:
+ distribution: 'zulu'
+ java-version: '8'
+ cache: 'maven'
+ server-id: central
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_TOKEN
+ gpg-private-key: ${{ secrets.MAVEN_CENTRAL_GPG_PRIVATE_KEY }}
+ gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+ - name: Publish to Maven Central
+ run: |
+ ./mvnw -B clean deploy -PsonatypeRelease -DskipTests
+ env:
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
+ MAVEN_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_CENTRAL_GPG_PASSPHRASE }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 0000000..dda789f
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,33 @@
+name: Publish Snapshot to Maven Central
+
+on:
+ push:
+ branches:
+ - master
+ tags:
+ - 'v[0-9]+.[0-9]+.[0-9]+\-dev.[0-9]+'
+
+jobs:
+ publish-snapshot:
+ if: "!contains(github.event.head_commit.message, '[maven-release-plugin]')"
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v5
+
+ - name: Set up JDK 8
+ uses: actions/setup-java@v5
+ with:
+ distribution: 'zulu'
+ java-version: '8'
+ cache: 'maven'
+ server-id: central-portal-snapshots
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_TOKEN
+
+ - name: Publish Snapshot to Maven Central
+ run: |
+ ./mvnw -B clean deploy -PsonatypeSnapshot -DskipTests
+ env:
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
+ MAVEN_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..a741430
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,147 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Tests
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+env:
+ TARANTOOL_REGISTRY: "registry.ps.tarantool.io/"
+ TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ps.tarantool.io/"
+
+jobs:
+ tests-cartridge-container:
+ 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'
+ java-version: '8'
+ cache: 'maven'
+
+ - name: Docker login to private registry
+ run: docker login "$TARANTOOL_REGISTRY" -u admin -p "${{ secrets.TARANTOOL_REGISTRY_PASSWORD }}"
+
+ - name: Build
+ run: ./mvnw -B clean package --file pom.xml
+
+ - name: Run unit tests
+ run: ./mvnw -B test -P unit -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml
+
+ - name: Run integration tests
+ env:
+ TARANTOOL_SERVER_USER: root
+ TARANTOOL_SERVER_GROUP: root
+ TARANTOOL_VERSION: "2.11.2-ubuntu20.04"
+ run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml
+
+ - name: Print system images
+ run: docker images
+
+ - name: Upload jacoco exec results
+ uses: actions/upload-artifact@v4
+ with:
+ name: tests-cartridge-container-jacoco
+ path: "**/jacoco-cartridge-container.exec"
+ retention-days: 5
+ overwrite: true
+
+ tests-tarantool-container:
+ if: "!contains(github.event.head_commit.message, '[maven-release-plugin]')"
+ runs-on: ubuntu-latest
+ timeout-minutes: 25
+ strategy:
+ matrix:
+ tarantool-version: [ "1.x-centos7", "2.11.2-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'
+ java-version: '8'
+ cache: 'maven'
+
+ - name: Docker login to private registry
+ run: docker login "$TARANTOOL_REGISTRY" -u admin -p "${{ secrets.TARANTOOL_REGISTRY_PASSWORD }}"
+
+ - name: Build and run integration matrix tests
+ env:
+ TARANTOOL_VERSION: ${{ matrix.tarantool-version }}
+ TARANTOOL_SERVER_USER: root
+ TARANTOOL_SERVER_GROUP: root
+ run: ./mvnw -B test -P tarantool-container -Djacoco.destFile=target/jacoco-tarantool-container.exec --file pom.xml
+
+ - name: Print system images
+ run: docker images
+
+ - name: Upload jacoco exec results
+ uses: actions/upload-artifact@v4
+ with:
+ name: tests-tarantool-container-jacoco
+ path: "**/jacoco-tarantool-container.exec"
+ retention-days: 5
+ overwrite: true
+
+ merge-jacoco-report:
+ if: "!contains(github.event.head_commit.message, '[maven-release-plugin]')"
+ name: Jacoco Merge Results
+ needs:
+ - tests-cartridge-container
+ - tests-tarantool-container
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v5
+ with:
+ distribution: 'zulu'
+ java-version: '8'
+ cache: 'maven'
+
+ - uses: actions/download-artifact@v4
+ with:
+ name: tests-cartridge-container-jacoco
+ path: .
+
+ - uses: actions/download-artifact@v4
+ with:
+ name: tests-tarantool-container-jacoco
+ path: .
+
+ - name: merge results
+ run: |
+ ./mvnw package jacoco:merge jacoco:report -DskipTests -Darguments=-DskipTests
+
+ - name: Upload jacoco coverage despite the check result
+ if: ${{ always() }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: coverage-results-report
+ path: target/site/jacoco
+ if-no-files-found: error
+ overwrite: true
+
+ - name: Jacoco Report to PR
+ id: jacoco
+ uses: madrapps/jacoco-report@v1.6.1
+ with:
+ paths: target/site/jacoco/jacoco.xml
+ token: ${{ secrets.GITHUB_TOKEN }}
+ min-coverage-overall: 40
+ min-coverage-changed-files: 60
+ update-comment: true
diff --git a/.github/workflows/ubuntu-master.yml b/.github/workflows/ubuntu-master.yml
deleted file mode 100644
index 6b165e3..0000000
--- a/.github/workflows/ubuntu-master.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: ubuntu-master
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: '8'
- cache: 'maven'
-
- - name: Store docker images
- uses: satackey/action-docker-layer-caching@v0.0.11
- continue-on-error: true
-
- - name: Build with Maven
- env:
- TARANTOOL_SERVER_USER: root
- TARANTOOL_SERVER_GROUP: root
- run: mvn -e -B verify --file pom.xml
-
- - name: Run enterprise tests
- env:
- TARANTOOL_SERVER_USER: root
- TARANTOOL_SERVER_GROUP: root
- DOWNLOAD_SDK_URI: ${{ secrets.DOWNLOAD_SDK_URI }}
- SDK_VERSION: tarantool-enterprise-sdk-nogc64-2.10.7-0-r563.linux.x86_64
- run: mvn -B test -P enterprise --file pom.xml
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index b901097..7e9c1e3 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,103 +1,72 @@
/*
- * Copyright 2007-present the original author or authors.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
- private static final String WRAPPER_VERSION = "0.5.6";
- /**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
- */
- private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
- + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.concurrent.ThreadLocalRandom;
- /**
- * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
- * use instead of the default one.
- */
- private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
- ".mvn/wrapper/maven-wrapper.properties";
+public final class MavenWrapperDownloader {
+ private static final String WRAPPER_VERSION = "3.3.4";
- /**
- * Path where the maven-wrapper.jar will be saved to.
- */
- private static final String MAVEN_WRAPPER_JAR_PATH =
- ".mvn/wrapper/maven-wrapper.jar";
+ private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
- /**
- * Name of the property which should be used to override the default download url for the wrapper.
- */
- private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+ public static void main(String[] args) {
+ log("Apache Maven Wrapper Downloader " + WRAPPER_VERSION);
- public static void main(String args[]) {
- System.out.println("- Downloader started");
- File baseDirectory = new File(args[0]);
- System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
- // If the maven-wrapper.properties exists, read it and check if it contains a custom
- // wrapperUrl parameter.
- File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
- String url = DEFAULT_DOWNLOAD_URL;
- if(mavenWrapperPropertyFile.exists()) {
- FileInputStream mavenWrapperPropertyFileInputStream = null;
- try {
- mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
- Properties mavenWrapperProperties = new Properties();
- mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
- url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
- } catch (IOException e) {
- System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
- } finally {
- try {
- if(mavenWrapperPropertyFileInputStream != null) {
- mavenWrapperPropertyFileInputStream.close();
- }
- } catch (IOException e) {
- // Ignore ...
- }
- }
+ if (args.length != 2) {
+ System.err.println(" - ERROR wrapperUrl or wrapperJarPath parameter missing");
+ System.exit(1);
}
- System.out.println("- Downloading from: " + url);
- File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
- if(!outputFile.getParentFile().exists()) {
- if(!outputFile.getParentFile().mkdirs()) {
- System.out.println(
- "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
- }
- }
- System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
- downloadFileFromURL(url, outputFile);
- System.out.println("Done");
- System.exit(0);
- } catch (Throwable e) {
- System.out.println("- Error downloading");
- e.printStackTrace();
+ log(" - Downloader started");
+ final URL wrapperUrl = URI.create(args[0]).toURL();
+ final Path baseDir = Paths.get(".").toAbsolutePath().normalize();
+ final Path wrapperJarPath = baseDir.resolve(args[1]).normalize();
+ if (!wrapperJarPath.startsWith(baseDir)) {
+ throw new IOException("Invalid path: outside of allowed directory");
+ }
+ downloadFileFromURL(wrapperUrl, wrapperJarPath);
+ log("Done");
+ } catch (IOException e) {
+ System.err.println("- Error downloading: " + e.getMessage());
+ if (VERBOSE) {
+ e.printStackTrace();
+ }
System.exit(1);
}
}
- private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ private static void downloadFileFromURL(URL wrapperUrl, Path wrapperJarPath)
+ throws IOException {
+ log(" - Downloading to: " + wrapperJarPath);
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
- String username = System.getenv("MVNW_USERNAME");
- char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ final String username = System.getenv("MVNW_USERNAME");
+ final char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
@@ -105,13 +74,23 @@ protected PasswordAuthentication getPasswordAuthentication() {
}
});
}
- URL website = new URL(urlString);
- ReadableByteChannel rbc;
- rbc = Channels.newChannel(website.openStream());
- FileOutputStream fos = new FileOutputStream(destination);
- fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
- fos.close();
- rbc.close();
+ Path temp = wrapperJarPath
+ .getParent()
+ .resolve(wrapperJarPath.getFileName() + "."
+ + Long.toUnsignedString(ThreadLocalRandom.current().nextLong()) + ".tmp");
+ try (InputStream inStream = wrapperUrl.openStream()) {
+ Files.copy(inStream, temp, StandardCopyOption.REPLACE_EXISTING);
+ Files.move(temp, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING);
+ } finally {
+ Files.deleteIfExists(temp);
+ }
+ log(" - Downloader complete");
+ }
+
+ private static void log(String msg) {
+ if (VERBOSE) {
+ System.out.println(msg);
+ }
}
}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
index 2cc7d4a..eebc3c1 100644
Binary files a/.mvn/wrapper/maven-wrapper.jar and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572..7bb2882 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,4 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=source
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e51dab..d2b2926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,41 @@
## [Unreleased]
+## [1.4.1] - 2025-11-07
+- Bump httpclient from 4.5.14 to httpclient5 5.5.1
+- Bump various maven plugins
+
+## [1.4.0] - 2025-07-24
+- Bump testcontainers.version from 1.19.3 to 1.21.3
+- Bump jackson-annotations from 2.14.0 to 2.18.4
+- Bump slf4j-api from 2.0.3 to 2.0.17
+- Bump snakeyaml from 2.0 to 2.3
+- Bump httpclient from 4.5.1 to 4.5.14
+- Bump logback-classic from 1.3.4 to 1.3.15
+- Bump junit-jupiter from 5.8.1 to 5.13.3
+
+## [1.3.3] - 2024-05-06
+- Add support for environment variable `TARANTOOL_REGISTRY`
+- Remove enterprise tests
+
+## [1.3.2] - 2024-04-25
+- Fix NullPointerException during building docker image when images with null tags exist on a local machine.
+
+## [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.
+ ```
+ was: ${TARANTOOL_VERSION}-centos7 # TARANTOOL_VERSION == 2.11.2
+ now: ${TARANTOOL_VERSION} # TARANTOOL_VERSION could be == 2.11.2-centos7
+ ```
+ ([#114](https://github.com/tarantool/testcontainers-java-tarantool/pull/114))
+- Support executeCommand for tarantool 3.0+
+
+
## [1.2.0] - 2023-12-14
- Remove the default value for `TARANTOOL_CLUSTER_COOKIE` env variable in cartridge container.
diff --git a/README.md b/README.md
index 6b92125..bbf1af7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# TestContainers Tarantool module
-[](https://github.com/tarantool/testcontainers-java-tarantool/actions/workflows/ubuntu-master.yml)
+[](https://github.com/tarantool/testcontainers-java-tarantool/actions/workflows/tests.yml)
Testcontainers module for the [Tarantool](https://tarantool.io) database and application server and the [Tarantool Cartridge](https://tarantool.io/cartridge) framework.
@@ -14,7 +14,7 @@ Add the Maven dependency:
io.tarantool
testcontainers-java-tarantool
- 1.2.0
+ 1.4.1
```
@@ -167,16 +167,20 @@ public class SomeOtherTest {
private static final TarantoolCartridgeContainer container =
// Pass the classpath-relative paths of the instances configuration and topology script files
new TarantoolCartridgeContainer("cartridge/instances.yml", "cartridge/topology.lua")
- // Point out the classpath-relative directory where the application files reside
- .withDirectoryBinding("cartridge")
- .withRouterHost("localhost") // Optional, "localhost" is default
- .withRouterPort(3301) // Binary port, optional, 3301 is default
- .withAPIPort(8801) // Cartridge HTTP API port, optional, 8081 is default
- .withRouterUsername("admin") // Specify the actual username, default is "admin"
- .withRouterPassword("testapp-cluster-cookie") // Specify the actual password, see the "cluster_cookie" parameter
- // in the cartridge.cfg({...}) call in your application.
- // Usually it can be found in the init.lua module
- .withReuse(true); // allows to reuse the container build once for faster testing
+ // Tarantool URI, optional. Default is "localhost"
+ .withRouterHost("localhost")
+ // Binary port, optional. Default is 3301
+ .withRouterPort(3301)
+ // Cartridge HTTP API port, optional, 8081 is default
+ .withAPIPort(8801)
+ // Specify the actual username, default is "admin"
+ .withRouterUsername("admin")
+ // Specify the actual password, see the "cluster_cookie" parameter
+ // in the cartridge.cfg({...}) call in your application.
+ // Usually it can be found in the init.lua module
+ .withRouterPassword("secret-cluster-cookie")
+ // allows to reuse the container build once for faster testing
+ .withReuse(true);
// Use the created container in tests
public void testFoo() {
@@ -193,6 +197,48 @@ public class SomeOtherTest {
}
```
+##### Environment variables of cartridge container and build arguments:
+###### Build arguments:
+
+This section describes the Docker image build arguments and environment variables inside the container. It is worth
+nothing that almost all build arguments listed here are passed into environment variables of the same name. At the
+moment, the following arguments are available to build the image:
+
+- `CARTRIDGE_SRC_DIR` - directory on the host machine that contains all the .lua scripts needed to initialize and run
+cartridge. Defaults is `cartridge`. **Only as a build argument.**
+- `TARANTOOL_WORKDIR` - a directory where all data will be stored: snapshots, wal logs and cartridge config files.
+Defaults is `/app`. Converts to an environment variable. It is not recommended to override via the `withEnv(...)` method.
+- `TARANTOOL_RUNDIR` - a directory where PID and socket files are stored. Defaults is `/tmp/run`. Converts to an
+environment variable. It is not recommended to override via the `withEnv(...)` method.
+- `TARANTOOL_DATADIR` - a directory containing the instances working directories. Defaults is `/tmp/data`. Converts to
+an environment variable. It is not recommended to override via the `withEnv(...)` method.
+- `TARANTOOL_LOGDIR` - the directory where log files are stored. Defaults is `/tmp/log`. Converts to an environment
+- variable. It is not recommended to override via the `withEnv(...)` method.
+- `TARANTOOL_INSTANCES_FILE` - path to the configuration file. Defaults is `./instances.yml`. Converts to an environment
+variable. It is not recommended to override via the `withEnv(...)` method.
+- `START_DELAY` - the time after which cartridge will actually run after the container has started. Converts to an
+environment variable. It is not recommended to override via the `withEnv(...)` method.
+
+You can set the Docker image build arguments using a map, which is passed as an input argument to the constructor when
+creating a container in Java code. See example: https://github.com/tarantool/testcontainers-java-tarantool/blob/355d1e985bd10beca83bc7ca77f919a288709419/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java#L111-L119
+
+###### Environment variables:
+
+To set an environment variable, use the `withEnv(...)` method of testcontainers API. Full list of variables the
+environments used in cartridge can be found here [link](https://www.tarantool.io/ru/doc/2.11/book/cartridge/cartridge_api/modules/cartridge/#cfg-opts-box-opts).
+
+***Note:*** As shown in the previous section, some build arguments are converted to environment variables and used to
+cartridge build at the image build stage.
+
+An example of how to set the `TARANTOOL_CLUSTER_COOKIE` parameter: https://github.com/tarantool/testcontainers-java-tarantool/blob/355d1e985bd10beca83bc7ca77f919a288709419/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java#L57-L82
+
+##### Mapping ports
+
+Often there is a need to connect to a container through a specific port. To achieve this goal it is necessary
+to know the mapped port specified in the Java code. To get the mapped port, use the getMappedPort(...)` method of
+testcontainers API. See examples: https://github.com/tarantool/testcontainers-java-tarantool/blob/ae580cb59d4621d7c11e5f80c394ec141d4c92b3/src/test/java/org/testcontainers/containers/TarantoolCartridgePortMappingTest.java#L22-L98
+
+
## License
See [LICENSE](LICENSE).
diff --git a/mvnw b/mvnw
index 41c0f0c..1ddd97b 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Apache Maven Wrapper startup batch script, version 3.3.4
#
# Required ENV vars:
# ------------------
@@ -27,284 +27,312 @@
#
# Optional ENV vars
# -----------------
-# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
-if [ -z "$MAVEN_SKIP_RC" ] ; then
+if [ -z "$MAVEN_SKIP_RC" ]; then
- if [ -f /etc/mavenrc ] ; then
+ if [ -f /usr/local/etc/mavenrc ]; then
+ . /usr/local/etc/mavenrc
+ fi
+
+ if [ -f /etc/mavenrc ]; then
. /etc/mavenrc
fi
- if [ -f "$HOME/.mavenrc" ] ; then
+ if [ -f "$HOME/.mavenrc" ]; then
. "$HOME/.mavenrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
+cygwin=false
+darwin=false
mingw=false
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- export JAVA_HOME="`/usr/libexec/java_home`"
- else
- export JAVA_HOME="/Library/Java/Home"
- fi
+case "$(uname)" in
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+ darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ JAVA_HOME="$(/usr/libexec/java_home)"
+ export JAVA_HOME
+ else
+ JAVA_HOME="/Library/Java/Home"
+ export JAVA_HOME
fi
- ;;
+ fi
+ ;;
esac
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
+if [ -z "$JAVA_HOME" ]; then
+ if [ -r /etc/gentoo-release ]; then
+ JAVA_HOME=$(java-config --jre-home)
fi
fi
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
-
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
-
- saveddir=`pwd`
-
- M2_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
-
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
-
# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] \
+ && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+ [ -n "$CLASSPATH" ] \
+ && CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
fi
# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+if $mingw; then
+ [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
+ && JAVA_HOME="$(
+ cd "$JAVA_HOME" || (
+ echo "cannot cd into $JAVA_HOME." >&2
+ exit 1
+ )
+ pwd
+ )"
fi
if [ -z "$JAVA_HOME" ]; then
- javaExecutable="`which javac`"
- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ javaExecutable="$(which javac)"
+ if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
- if $darwin ; then
- javaHome="`dirname \"$javaExecutable\"`"
- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ readLink=$(which readlink)
+ if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+ if $darwin; then
+ javaHome="$(dirname "$javaExecutable")"
+ javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
else
- javaExecutable="`readlink -f \"$javaExecutable\"`"
+ javaExecutable="$(readlink -f "$javaExecutable")"
fi
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ javaHome="$(dirname "$javaExecutable")"
+ javaHome=$(expr "$javaHome" : '\(.*\)/bin')
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+if [ -z "$JAVACMD" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD="`which java`"
+ JAVACMD="$(
+ \unset -f command 2>/dev/null
+ \command -v java
+ )"
fi
fi
-if [ ! -x "$JAVACMD" ] ; then
+if [ ! -x "$JAVACMD" ]; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
+if [ -z "$JAVA_HOME" ]; then
+ echo "Warning: JAVA_HOME environment variable is not set." >&2
fi
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
-
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
+ if [ -z "$1" ]; then
+ echo "Path not specified to find_maven_basedir" >&2
return 1
fi
basedir="$1"
wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
+ while [ "$wdir" != '/' ]; do
+ if [ -d "$wdir"/.mvn ]; then
basedir=$wdir
break
fi
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
- wdir=`cd "$wdir/.."; pwd`
+ wdir=$(
+ cd "$wdir/.." || exit 1
+ pwd
+ )
fi
# end of workaround
done
- echo "${basedir}"
+ printf '%s' "$(
+ cd "$basedir" || exit 1
+ pwd
+ )"
}
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
- echo "$(tr -s '\n' ' ' < "$1")"
+ # Remove \r in case we run on Windows within Git Bash
+ # and check out the repository with auto CRLF management
+ # enabled. Otherwise, we may read lines that are delimited with
+ # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+ # splitting rules.
+ tr -s '\r\n' ' ' <"$1"
fi
}
-BASE_DIR=`find_maven_basedir "$(pwd)"`
+log() {
+ if [ "$MVNW_VERBOSE" = true ]; then
+ printf '%s\n' "$1"
+ fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
if [ -z "$BASE_DIR" ]; then
- exit 1;
+ exit 1
fi
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
+
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
# This allows using the maven wrapper in projects that prohibit checking in binary data.
##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+ log "Found $wrapperJarPath"
else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
- fi
- if [ -n "$MVNW_REPOURL" ]; then
- jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ log "Couldn't find $wrapperJarPath, downloading it ..."
+
+ if [ -n "$MVNW_REPOURL" ]; then
+ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+ else
+ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+ fi
+ while IFS="=" read -r key value; do
+ case "$key" in wrapperUrl)
+ wrapperUrl=$(trim "${value-}")
+ break
+ ;;
+ esac
+ done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+ log "Downloading from: $wrapperUrl"
+
+ if $cygwin; then
+ wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+ fi
+
+ if command -v wget >/dev/null; then
+ log "Found wget ... using wget"
+ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget ${QUIET:+"$QUIET"} "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
else
- jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ wget ${QUIET:+"$QUIET"} --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
fi
- while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
- esac
- done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Downloading from: $jarUrl"
+ elif command -v curl >/dev/null; then
+ log "Found curl ... using curl"
+ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+ else
+ curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
fi
- wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ else
+ log "Falling back to using Java to download"
+ javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+ # For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
- wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ javaSource=$(cygpath --path --windows "$javaSource")
+ javaClass=$(cygpath --path --windows "$javaClass")
fi
-
- if command -v wget > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found wget ... using wget"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget "$jarUrl" -O "$wrapperJarPath"
- else
- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found curl ... using curl"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl -o "$wrapperJarPath" "$jarUrl" -f
- else
- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
- fi
-
- else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Falling back to using Java to download"
- fi
- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
+ if [ -e "$javaSource" ]; then
+ if [ ! -e "$javaClass" ]; then
+ log " - Compiling MavenWrapperDownloader.java ..."
+ ("$JAVA_HOME/bin/javac" "$javaSource")
+ fi
+ if [ -e "$javaClass" ]; then
+ log " - Running MavenWrapperDownloader.java ..."
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+ fi
fi
+ fi
fi
##########################################################################################
# End of extension
##########################################################################################
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
- echo $MAVEN_PROJECTBASEDIR
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+ case "$key" in wrapperSha256Sum)
+ wrapperSha256Sum=$(trim "${value-}")
+ break
+ ;;
+ esac
+done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+ wrapperSha256Result=false
+ if command -v sha256sum >/dev/null; then
+ if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c - >/dev/null 2>&1; then
+ wrapperSha256Result=true
+ fi
+ elif command -v shasum >/dev/null; then
+ if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then
+ wrapperSha256Result=true
+ fi
+ else
+ echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ fi
+ if [ $wrapperSha256Result = false ]; then
+ echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+ echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+ echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+ exit 1
+ fi
fi
+
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+ [ -n "$JAVA_HOME" ] \
+ && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+ [ -n "$CLASSPATH" ] \
+ && CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+ [ -n "$MAVEN_PROJECTBASEDIR" ] \
+ && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
fi
# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+# shellcheck disable=SC2086 # safe args
exec "$JAVACMD" \
$MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 8611571..8366e21 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -18,13 +18,12 @@
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@@ -46,8 +45,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
:skipRcPre
@setlocal
@@ -60,22 +59,22 @@ set ERROR_CODE=0
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
-echo.
+echo. >&2
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
-echo.
+echo. >&2
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
-echo.
+echo. >&2
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
-echo.
+echo. >&2
goto error
@REM ==== END VALIDATION ====
@@ -120,10 +119,10 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
)
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@@ -134,11 +133,11 @@ if exist %WRAPPER_JAR% (
)
) else (
if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
+ echo Downloading from: %WRAPPER_URL%
)
powershell -Command "&{"^
@@ -146,7 +145,7 @@ if exist %WRAPPER_JAR% (
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
@@ -154,11 +153,36 @@ if exist %WRAPPER_JAR% (
)
@REM End of extension
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+ powershell -Command "&{"^
+ "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^
+ "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+ "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+ " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+ " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+ " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+ " exit 1;"^
+ "}"^
+ "}"
+ if ERRORLEVEL 1 goto error
+)
+
@REM Provide a "standardized" way to retrieve the CLI args that will
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %WRAPPER_JAR% ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
@@ -168,15 +192,15 @@ set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
index b1c100d..a484b1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,11 +49,11 @@
scm:git:git@github.com:tarantool/testcontainers-java-tarantool.git
scm:git:git@github.com:tarantool/testcontainers-java-tarantool.git
http://github.com/tarantool/testcontainers-java-tarantool/tree/master
- v1.2.0
+ HEAD
- 1.19.3
+ 1.21.3
UTF-8
UTF-8
${project.basedir}/src/test/resources/logback-test.xml
@@ -65,12 +65,12 @@
com.fasterxml.jackson.core
jackson-annotations
- 2.14.0
+ 2.18.4
org.slf4j
slf4j-api
- 2.0.3
+ 2.0.17
@@ -84,7 +84,7 @@
org.yaml
snakeyaml
- 2.0
+ 2.3
org.slf4j
@@ -92,17 +92,25 @@
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ 5.5.1
+ test
+
+
ch.qos.logback
logback-classic
- 1.3.4
+ 1.3.15
test
+
- org.junit.jupiter
- junit-jupiter
- 5.8.1
- test
+ org.junit.jupiter
+ junit-jupiter
+ 5.13.3
+ test
org.testcontainers
@@ -125,45 +133,12 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.2.0
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.0
-
- 1.8
- true
- true
- true
- true
- true
- 8
- 8
-
- **/package-info.java
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 3.0.0-M5
-
-
- **/*Test.java
-
-
- ${logging.config}
- ${logging.logLevel}
-
- false
-
+ 3.3.1
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ 3.12.0
false
true
@@ -172,21 +147,10 @@
true
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.8
- true
-
- ossrh
- https://oss.sonatype.org/
- false
-
-
org.apache.maven.plugins
maven-release-plugin
- 3.0.0-M1
+ 3.1.1
true
release
@@ -195,21 +159,64 @@
v@{project.version}
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.12
+
+
+
+ prepare-agent
+
+
+ true
+
+
+
+
+
+
+ ${project.build.directory}
+
+ *.exec
+
+
+
+
+
- enterprise
+ unit
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.14.1
+
+ 1.8
+ true
+ true
+ true
+ true
+ true
+ 8
+ 8
+
+ **/package-info.java
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
- 3.0.0-M5
+ 3.5.2
- **/*TestEnterprise.java
+ **/*Test.java
${logging.config}
@@ -222,12 +229,101 @@
- release
+ integration
- maven-source-plugin
+ org.apache.maven.plugins
+ maven-antrun-plugin
3.2.0
+
+
+ process-test-classes
+ process-test-classes
+
+ run
+
+
+
+
+
+ maven-surefire-plugin
+ 3.5.2
+
+
+ **/*IT.java
+
+
+ **/*TarantoolContainer*IT.java
+
+
+ ${logging.config}
+ ${logging.logLevel}
+
+ false
+
+
+
+
+
+
+ tarantool-container
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.5.2
+
+
+ **/*TarantoolContainer*IT.java
+
+
+ ${logging.config}
+ ${logging.logLevel}
+
+ false
+
+
+
+
+
+
+ sonatypeSnapshot
+
+
+
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.9.0
+ true
+
+ central-portal-snapshots
+ io.tarantool.testcontainers-java-tarantool
+ uploaded
+
+
+
+
+
+
+ sonatypeRelease
+
+
+
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.9.0
+ true
+
+ central
+ io.tarantool.testcontainers-java-tarantool
+ uploaded
+
+
+
+ maven-source-plugin
+ 3.3.1
@@ -259,7 +355,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ 3.12.0
attach-javadocs
@@ -272,7 +368,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 1.6
+ 3.2.8
sign-artifacts
@@ -294,14 +390,17 @@
-
-
- sonatype-nexus-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
+
- sonatype-nexus-staging
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ Central Portal Snapshots
+ central-portal-snapshots
+ https://central.sonatype.com/repository/maven-snapshots/
+
+ false
+
+
+ true
+
-
+
diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainer.java b/src/main/java/org/testcontainers/containers/TarantoolContainer.java
index e9d9856..0e42d9d 100644
--- a/src/main/java/org/testcontainers/containers/TarantoolContainer.java
+++ b/src/main/java/org/testcontainers/containers/TarantoolContainer.java
@@ -17,9 +17,9 @@
public class TarantoolContainer extends GenericContainer
implements TarantoolContainerOperations {
- public static final String TARANTOOL_IMAGE = "tarantool/tarantool";
- public static final String DEFAULT_IMAGE_VERSION = "2.10.5";
- public static final String DEFAULT_TARANTOOL_BASE_IMAGE = String.format("%s:%s-centos7", TARANTOOL_IMAGE, DEFAULT_IMAGE_VERSION);
+ public static final String DEFAULT_IMAGE = "tarantool/tarantool";
+ public static final String DEFAULT_TAG = "2.11.2-ubuntu20.04";
+ public static final String DEFAULT_BASE_IMAGE = String.format("%s:%s", DEFAULT_IMAGE, DEFAULT_TAG);
private static final String DEFAULT_HOST = "localhost";
@@ -50,7 +50,7 @@ public class TarantoolContainer extends GenericContainer
* Constructor for {@link TarantoolContainer}
*/
public TarantoolContainer() {
- this(DEFAULT_TARANTOOL_BASE_IMAGE);
+ this(DEFAULT_BASE_IMAGE);
setImageNameFromEnv();
}
@@ -386,7 +386,11 @@ public T executeCommandDecoded(String command) throws Exception {
private void setImageNameFromEnv() {
String version = System.getenv("TARANTOOL_VERSION");
if (version != null && !version.trim().isEmpty()) {
- setDockerImageName(String.format("%s:%s-centos7", TARANTOOL_IMAGE, version));
+ String registry = System.getenv("TARANTOOL_REGISTRY");
+ String image = registry == null || registry.isEmpty() ?
+ DEFAULT_IMAGE :
+ (registry.endsWith("/") ? registry + DEFAULT_IMAGE : registry + "/" + DEFAULT_IMAGE);
+ setDockerImageName(String.format("%s:%s", image, version));
}
}
}
diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java b/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java
index 242b041..3c847bc 100644
--- a/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java
+++ b/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java
@@ -25,6 +25,8 @@ public final class TarantoolContainerClientHelper {
"Executed script %s with exit code %d, stderr: \"%s\", stdout: \"%s\"";
private static final String EXECUTE_COMMAND_ERROR_TEMPLATE =
"Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
+ // Generates bash command witch creates executable lua file with connection to required node
+ // and evaluation of needed lua code
private static final String MTLS_COMMAND_TEMPLATE =
"echo \" " +
" print(require('yaml').encode( " +
@@ -35,7 +37,8 @@ public final class TarantoolContainerClientHelper {
" ):eval('%s')}) " +
" ); " +
" os.exit(); " +
- "\" | tarantool";
+ "\" > container-tmp.lua &&" +
+ " tarantool container-tmp.lua";
private static final String SSL_COMMAND_TEMPLATE =
"echo \" " +
" print(require('yaml').encode( " +
@@ -45,7 +48,8 @@ public final class TarantoolContainerClientHelper {
" ):eval('%s')}) " +
" ); " +
" os.exit(); " +
- "\" | tarantool";
+ "\" > container-tmp.lua &&" +
+ " tarantool container-tmp.lua";
private static final String COMMAND_TEMPLATE = "echo \" " +
" print(require('yaml').encode( " +
" {require('net.box').connect( " +
@@ -54,7 +58,8 @@ public final class TarantoolContainerClientHelper {
" ):eval('%s')}) " +
" ); " +
" os.exit(); " +
- "\" | tarantool";
+ "\" > container-tmp.lua &&" +
+ " tarantool container-tmp.lua";
TarantoolContainerClientHelper(TarantoolContainerOperations> container) {
this.container = container;
diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java b/src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java
index 6c5a4f3..7438e35 100644
--- a/src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java
+++ b/src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java
@@ -6,6 +6,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.BuildImageCmd;
@@ -71,6 +72,7 @@ private static boolean hasImage(String tag) {
final List images = getDockerClient().listImagesCmd().exec();
return images.stream()
.map(Image::getRepoTags)
+ .filter(Objects::nonNull)
.map(Arrays::asList)
.flatMap(Collection::stream)
.anyMatch(repoTag -> repoTag.equals(tag));
diff --git a/src/main/java/org/testcontainers/containers/TarantoolImageParams.java b/src/main/java/org/testcontainers/containers/TarantoolImageParams.java
index 6c0f8a7..3723f8f 100644
--- a/src/main/java/org/testcontainers/containers/TarantoolImageParams.java
+++ b/src/main/java/org/testcontainers/containers/TarantoolImageParams.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -38,6 +39,17 @@ public TarantoolImageParams(String tag, File dockerfile, Map bui
this.buildArgs = buildArgs;
}
+ /**
+ * Custom constructor for tarantool image parameters
+ *
+ * @param tag docker image tag
+ * @param dockerfile dockerfile for building custom tarantool image
+ * @param baseImageName default image name for building docker image
+ */
+ public TarantoolImageParams(String tag, File dockerfile, String baseImageName) {
+ this(tag, dockerfile, extract(baseImageName));
+ }
+
/**
* Getter for sdk version
*
@@ -64,4 +76,22 @@ public File getDockerfile() {
Map getBuildArgs() {
return buildArgs;
}
+
+ /**
+ * Extract build arguments from environment variables
+ *
+ * @param defaultImage default image name for building docker image
+ * @return map of building arguments
+ */
+ private static Map extract(String defaultImage) {
+ final Map buildArgs = new HashMap<>();
+ String registry = System.getenv("TARANTOOL_REGISTRY");
+ if (registry != null && !registry.isEmpty()) {
+ buildArgs.put("IMAGE", registry.endsWith("/") ? registry + defaultImage : registry + "/" + defaultImage);
+ }
+ buildArgs.put("DOWNLOAD_HOST", System.getenv("DOWNLOAD_HOST"));
+ buildArgs.put("SDK_PATH", System.getenv("SDK_PATH"));
+ buildArgs.put("CLUSTER_SRC_DIR", "vshard_cluster");
+ return buildArgs;
+ }
}
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile
index bac5f19..b4511cb 100644
--- a/src/main/resources/Dockerfile
+++ b/src/main/resources/Dockerfile
@@ -1,17 +1,17 @@
-ARG TARANTOOL_VERSION=2.11.0
-FROM tarantool/tarantool:${TARANTOOL_VERSION}-centos7 AS cartridge-base
+ARG IMAGE="tarantool/tarantool"
+ARG TARANTOOL_VERSION="2.11.2-ubuntu20.04"
+FROM $IMAGE:$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 +31,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
diff --git a/src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java b/src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java
index fc36c76..bdfa8b4 100644
--- a/src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java
+++ b/src/test/java/org/testcontainers/containers/CartridgeContainerTestUtils.java
@@ -1,6 +1,9 @@
package org.testcontainers.containers;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
@@ -21,4 +24,18 @@ static public void executeProfileReplaceSmokeTest(TarantoolCartridgeContainer co
assertEquals(1, result.size());
assertEquals(33, ((List) result.get(0)).get(3));
}
+
+ public static boolean isEnvInStdout(String stdout, Map env) {
+ Map envMap = Arrays.stream(stdout.split("\n"))
+ .collect(Collectors.toMap(toKey -> toKey.split("=")[0],
+ toValue -> {
+ String[] pair = toValue.split("=");
+ if (pair.length == 1) {
+ return "null";
+ }
+ return pair[1];
+ }));
+
+ return envMap.entrySet().containsAll(env.entrySet());
+ }
}
diff --git a/src/test/java/org/testcontainers/containers/TarantoolStaticContainerTest.java b/src/test/java/org/testcontainers/containers/StaticTarantoolContainerIT.java
similarity index 87%
rename from src/test/java/org/testcontainers/containers/TarantoolStaticContainerTest.java
rename to src/test/java/org/testcontainers/containers/StaticTarantoolContainerIT.java
index 111a98b..875c24d 100644
--- a/src/test/java/org/testcontainers/containers/TarantoolStaticContainerTest.java
+++ b/src/test/java/org/testcontainers/containers/StaticTarantoolContainerIT.java
@@ -13,10 +13,11 @@
* @author Ivan Dneprov
*/
@Testcontainers
-public class TarantoolStaticContainerTest {
+public class StaticTarantoolContainerIT {
+ protected static final String tarantoolVersion = System.getenv().get("TARANTOOL_VERSION");
@Container
- private static final TarantoolContainer container = new TarantoolContainer();
+ protected static final TarantoolContainer container = new TarantoolContainer();
@Test
public void testExecuteCommand() throws Exception {
diff --git a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java
similarity index 60%
rename from src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java
rename to src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java
index 6f1fa38..654c36d 100644
--- a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java
+++ b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java
@@ -1,12 +1,14 @@
package org.testcontainers.containers;
import java.time.Duration;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.rnorth.ducttape.RetryCountExceededException;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.Container.ExecResult;
import org.testcontainers.containers.exceptions.CartridgeTopologyException;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.junit.jupiter.Container;
@@ -16,18 +18,17 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* @author Alexey Kuzin
*/
@Testcontainers
-public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest {
+public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT {
@Container
private static final TarantoolCartridgeContainer container =
new TarantoolCartridgeContainer(
"Dockerfile",
- "cartridge",
+ System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge",
"cartridge/instances_fixedport.yml",
"cartridge/topology_fixedport.lua")
.withEnv("TARANTOOL_INSTANCES_FILE", "instances_fixedport.yml")
@@ -36,7 +37,7 @@ public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest {
.withAPIPort(18081)
.withRouterPort(13301)
.withLogConsumer(new Slf4jLogConsumer(
- LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.class)));
+ LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.class)));
@Test
public void test_StaticClusterContainer_StartsSuccessfully_ifFilesAreCopied() throws Exception {
@@ -56,7 +57,7 @@ public void testTarantoolClusterCookieDefault() throws Exception {
public void testTarantoolClusterCookieWithEnv() throws Exception {
try(TarantoolCartridgeContainer newContainer = new TarantoolCartridgeContainer(
"Dockerfile",
- "cartridge",
+ System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge",
"cartridge/instances.yml",
"cartridge/replicasets.yml")
.withEnv(TarantoolCartridgeContainer.ENV_TARANTOOL_CLUSTER_COOKIE, "secret")
@@ -64,12 +65,16 @@ public void testTarantoolClusterCookieWithEnv() throws Exception {
.withRouterPassword("secret")
.withStartupTimeout(Duration.ofMinutes(5))
.withLogConsumer(new Slf4jLogConsumer(
- LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromYamlTest.class))))
+ LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromYamlIT.class))))
{
newContainer.start();
- Map env = container.getEnvMap();
- assertFalse(env.containsKey(TarantoolCartridgeContainer.ENV_TARANTOOL_CLUSTER_COOKIE));
- List