update container setting

Author: vinlee19

.github/workflows/build-connector.yml

@@ -26,28 +26,6 @@ jobs:
     name: "Build Connector"
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
-    strategy:
-      matrix:
-        flink-version: ['1.15', '1.16', '1.17', '1.18', '1.19', '1.20']
-        include:
-          - flink-version: '1.15'
-            flink-full-version: '1.15.0'
-            flink-python-id: 'flink-python_2.12'
-          - flink-version: '1.16'
-            flink-full-version: '1.16.0'
-            flink-python-id: 'flink-python'
-          - flink-version: '1.17'
-            flink-full-version: '1.17.0'
-            flink-python-id: 'flink-python'
-          - flink-version: '1.18'
-            flink-full-version: '1.18.0'
-            flink-python-id: 'flink-python'
-          - flink-version: '1.19'
-            flink-full-version: '1.19.0'
-            flink-python-id: 'flink-python'
-          - flink-version: '1.20'
-            flink-full-version: '1.20.0'
-            flink-python-id: 'flink-python'
     defaults:
       run:
         shell: bash
@@ -71,9 +49,44 @@ jobs:
             ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
             ${{ runner.os }}-maven-
 
-      - name: Build Flink Connector
+      - name: Build flink connector 1.15
         run: |
           cd flink-doris-connector && mvn clean package \
-            -Dflink.version=${{ matrix.flink-full-version }} \
-            -Dflink.minor.version=${{ matrix.flink-version }} \
-            -Dflink.python.id=${{ matrix.flink-python-id }}
+            -Dflink.version=1.15.0 \
+            -Dflink.minor.version=1.15 \
+            -Dflink.python.id=flink-python_2.12
+
+      - name: Build flink connector 1.16
+        run: |
+          cd flink-doris-connector && mvn clean package \
+          -Dflink.version=1.16.0 \
+          -Dflink.minor.version=1.16 \
+          -Dflink.python.id=flink-python
+
+      - name: Build flink connector 1.17
+        run: |
+          cd flink-doris-connector && mvn clean package \
+            -Dflink.version=1.17.0 \
+            -Dflink.minor.version=1.17 \
+            -Dflink.python.id=flink-python
+
+      - name: Build flink connector 1.18
+        run: |
+          cd flink-doris-connector && mvn clean package \
+            -Dflink.version=1.18.0 \
+            -Dflink.minor.version=1.18 \
+            -Dflink.python.id=flink-python
+
+      - name: Build flink connector 1.19
+        run: |
+          cd flink-doris-connector && mvn clean package \
+            -Dflink.version=1.19.0 \
+            -Dflink.minor.version=1.19 \
+            -Dflink.python.id=flink-python
+
+      - name: Build flink connector 1.20
+        run: |
+          cd flink-doris-connector && mvn clean package \
+            -Dflink.version=1.20.0 \
+            -Dflink.minor.version=1.20 \
+            -Dflink.python.id=flink-python

flink-doris-connector/src/test/java/org/apache/doris/flink/container/instance/DorisContainer.java

@@ -24,6 +24,7 @@
 import org.apache.doris.flink.exception.DorisRuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -32,7 +33,6 @@
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException;
 import org.testcontainers.utility.DockerLoggerFactory;
-import org.testcontainers.utility.MountableFile;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -88,13 +88,14 @@ public GenericContainer<?> createDorisContainer() {
                                 "sh",
                                 "-c",
                                 "chmod -R 644 /root/be/conf/be.conf /root/fe/conf/fe.conf && chmod -R 755 /root/be/conf /root/fe/conf && chown -R root:root /root/be/conf /root/fe/conf")
-                        // use customer conf
-                        .withCopyFileToContainer(
-                                MountableFile.forClasspathResource("docker/doris/be.conf"),
-                                "/opt/apache-doris/be/conf/be.conf")
-                        .withCopyFileToContainer(
-                                MountableFile.forClasspathResource("docker/doris/fe.conf"),
-                                "/opt/apache-doris/fe/conf/fe.conf")
+                        .withClasspathResourceMapping(
+                                "docker/doris/be.conf",
+                                "/root/be/conf/be.conf",
+                                BindMode.READ_WRITE)
+                        .withClasspathResourceMapping(
+                                "docker/doris/fe.conf",
+                                "/root/fe/conf/fe.conf",
+                                BindMode.READ_WRITE)
                         // These exposed ports are used to connect to Doris. They are the default
                         // ports for yagagagaga/doris-standalone:2.1.7.
                         // For more information, see:
@@ -107,8 +108,7 @@ public GenericContainer<?> createDorisContainer() {
                                 FE.FLIGHT_SQL_PORT,
                                 BE.FLIGHT_SQL_PORT)
                         .withStartupTimeout(Duration.ofMinutes(5))
-                        .withEnv("TZ", systemTimeZone)
-                        .waitingFor(Wait.forListeningPort());
+                        .withEnv("TZ", systemTimeZone);
 
         container.setPortBindings(
                 Lists.newArrayList(
@@ -128,6 +128,10 @@ public void startContainer() {
             dorisContainer.start();
             // Wait for container to reach running state during first startup
             waitForContainerRunning();
+            ExecResult feExecResult = dorisContainer.execInContainer("cat", "/root/fe/conf/fe.conf");
+            ExecResult beExecResult = dorisContainer.execInContainer("cat", "/root/be/conf/be.conf");
+            LOG.info("FE config: {}", feExecResult.getStdout());
+            LOG.info("BE config: {}", beExecResult.getStdout());
             initializeJdbcConnection();
             initializeVariables();
             printClusterStatus();