Remove ssl support from TarantoolCartridgeContainer

Author: iDneprov

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 - Fix problem if topology isn't applied correctly
 - Bump testcontainers to 1.18.0
+- Move rocks building in build phase
 - **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer  
   (now it returns yaml string in Container.ExecResult not CompletableFuture).
 - **[breaking change]** Remove TarantoolContainer containers with TarantoolClientBuilder parameter.

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

@@ -188,7 +188,7 @@ public TarantoolCartridgeContainer(String dockerFile, String buildImageName,
      */
     public TarantoolCartridgeContainer(String dockerFile, String buildImageName, String instancesFile,
                                        String topologyConfigurationFile, final Map<String, String> buildArgs) {
-        this(buildImage(dockerFile, buildImageName), instancesFile, topologyConfigurationFile, buildArgs);
+        this(buildImage(dockerFile, buildImageName, buildArgs), instancesFile, topologyConfigurationFile, buildArgs);
     }
 
 // todo add SSL and mTLS cartridge test
@@ -256,12 +256,17 @@ private static Map<String, String> mergeBuildArguments(Map<String, String> build
         return args;
     }
 
-    private static ImageFromDockerfile buildImage(String dockerFile, String buildImageName) {
+    private static ImageFromDockerfile buildImage(String dockerFile, String buildImageName,
+            final Map<String, String> buildArgs) {
+        ImageFromDockerfile image;
         if (buildImageName != null && !buildImageName.isEmpty()) {
-            return new ImageFromDockerfile(buildImageName, false)
-                    .withFileFromClasspath("Dockerfile", dockerFile);
+            image = new ImageFromDockerfile(buildImageName, false);
+        } else {
+            image = new ImageFromDockerfile();
         }
-        return new ImageFromDockerfile().withFileFromClasspath("Dockerfile", dockerFile);
+        return image.withFileFromClasspath("Dockerfile", dockerFile)
+                   .withFileFromClasspath("cartridge", buildArgs.get("CARTRIDGE_SRC_DIR") == null ?
+                                                           "cartridge" : buildArgs.get("CARTRIDGE_SRC_DIR"));
     }
 
 // todo add SSL and mTLS cartridge test

src/main/resources/Dockerfile

@@ -1,21 +1,26 @@
 ARG TARANTOOL_VERSION=2.10.5
-FROM tarantool/tarantool:${TARANTOOL_VERSION}-centos7 AS tarantool-base
+FROM tarantool/tarantool:${TARANTOOL_VERSION}-centos7 AS cartridge-base
+
+# system preparations because docker mount directory as a root
 ARG TARANTOOL_SERVER_USER="root"
 ARG TARANTOOL_SERVER_GROUP="root"
-ARG TARANTOOL_WORKDIR="/app"
-ARG TARANTOOL_RUNDIR="/tmp/run"
-ARG TARANTOOL_DATADIR="/tmp/data"
-ARG TARANTOOL_INSTANCES_FILE="./instances.yml"
-ENV TARANTOOL_WORKDIR=$TARANTOOL_WORKDIR
-ENV TARANTOOL_RUNDIR=$TARANTOOL_RUNDIR
-ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR
-ENV TARANTOOL_INSTANCES_FILE=$TARANTOOL_INSTANCES_FILE
+USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP
+RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true
+
+# install dependencies
 RUN yum -y install cmake make gcc gcc-c++ git unzip cartridge-cli && \
     yum clean all
-RUN groupadd $TARANTOOL_SERVER_GROUP && useradd -m -s /bin/bash $TARANTOOL_SERVER_USER || true
-USER $TARANTOOL_SERVER_USER:$TARANTOOL_SERVER_GROUP
 RUN cartridge version
 
-FROM tarantool-base AS cartridge-base
+# build
+ARG CARTRIDGE_SRC_DIR="cartridge"
+ARG TARANTOOL_WORKDIR="/app"
+COPY $CARTRIDGE_SRC_DIR $TARANTOOL_WORKDIR
 WORKDIR $TARANTOOL_WORKDIR
+RUN cartridge build --verbose
+
+ENV TARANTOOL_RUNDIR="/tmp/run"
+ENV TARANTOOL_DATADIR="/tmp/data"
+ENV TARANTOOL_INSTANCES_FILE="./instances.yml"
+
 CMD cartridge build && cartridge start --run-dir=$TARANTOOL_RUNDIR --data-dir=$TARANTOOL_DATADIR --cfg=$TARANTOOL_INSTANCES_FILE

src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.java

@@ -25,7 +25,6 @@ public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest {
                     "Dockerfile",
                     "cartridge/instances_fixedport.yml",
                     "cartridge/topology_fixedport.lua")
-                    .withDirectoryBinding("cartridge")
                     .withEnv("TARANTOOL_INSTANCES_FILE", "instances_fixedport.yml")
                     .withStartupTimeout(Duration.ofSeconds(300))
                     .withUseFixedPorts(true)
@@ -46,7 +45,6 @@ public void test_retryingSetupTopology_shouldWork() {
                      "Dockerfile",
                      "cartridge/instances.yml",
                      "cartridge/incorrect_topology.lua")
-                     .withDirectoryBinding("cartridge")
                      .withLogConsumer(new Slf4jLogConsumer(
                          LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromLuaWithFixedPortsTest.class)))) {
             ContainerLaunchException ex = assertThrows(ContainerLaunchException.class, testContainer::start);

src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlTest.java

@@ -26,7 +26,6 @@ public class TarantoolCartridgeBootstrapFromYamlTest {
                     "Dockerfile",
                     "cartridge/instances.yml",
                     "cartridge/replicasets.yml")
-                    .withCopyFileToContainer(MountableFile.forClasspathResource("cartridge"), "/app")
                     .withStartupTimeout(Duration.ofSeconds(300))
                     .withLogConsumer(new Slf4jLogConsumer(
                             LoggerFactory.getLogger(TarantoolCartridgeBootstrapFromYamlTest.class)));