Skip to content

Commit fc3b4e1

Browse files
vinlee19vinlee19
committed
update container setting
1 parent 6ab18bf commit fc3b4e1

File tree

2 files changed

+53
-36
lines changed

2 files changed

+53
-36
lines changed

‎.github/workflows/build-connector.yml

+39-26
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,6 @@ jobs:
2626
name: "Build Connector"
2727
runs-on: ubuntu-latest
2828
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) }}
29-
strategy:
30-
matrix:
31-
flink-version: ['1.15', '1.16', '1.17', '1.18', '1.19', '1.20']
32-
include:
33-
- flink-version: '1.15'
34-
flink-full-version: '1.15.0'
35-
flink-python-id: 'flink-python_2.12'
36-
- flink-version: '1.16'
37-
flink-full-version: '1.16.0'
38-
flink-python-id: 'flink-python'
39-
- flink-version: '1.17'
40-
flink-full-version: '1.17.0'
41-
flink-python-id: 'flink-python'
42-
- flink-version: '1.18'
43-
flink-full-version: '1.18.0'
44-
flink-python-id: 'flink-python'
45-
- flink-version: '1.19'
46-
flink-full-version: '1.19.0'
47-
flink-python-id: 'flink-python'
48-
- flink-version: '1.20'
49-
flink-full-version: '1.20.0'
50-
flink-python-id: 'flink-python'
5129
defaults:
5230
run:
5331
shell: bash
@@ -71,9 +49,44 @@ jobs:
7149
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
7250
${{ runner.os }}-maven-
7351
74-
- name: Build Flink Connector
52+
- name: Build flink connector 1.15
7553
run: |
7654
cd flink-doris-connector && mvn clean package \
77-
-Dflink.version=${{ matrix.flink-full-version }} \
78-
-Dflink.minor.version=${{ matrix.flink-version }} \
79-
-Dflink.python.id=${{ matrix.flink-python-id }}
55+
-Dflink.version=1.15.0 \
56+
-Dflink.minor.version=1.15 \
57+
-Dflink.python.id=flink-python_2.12
58+
59+
- name: Build flink connector 1.16
60+
run: |
61+
cd flink-doris-connector && mvn clean package \
62+
-Dflink.version=1.16.0 \
63+
-Dflink.minor.version=1.16 \
64+
-Dflink.python.id=flink-python
65+
66+
- name: Build flink connector 1.17
67+
run: |
68+
cd flink-doris-connector && mvn clean package \
69+
-Dflink.version=1.17.0 \
70+
-Dflink.minor.version=1.17 \
71+
-Dflink.python.id=flink-python
72+
73+
- name: Build flink connector 1.18
74+
run: |
75+
cd flink-doris-connector && mvn clean package \
76+
-Dflink.version=1.18.0 \
77+
-Dflink.minor.version=1.18 \
78+
-Dflink.python.id=flink-python
79+
80+
- name: Build flink connector 1.19
81+
run: |
82+
cd flink-doris-connector && mvn clean package \
83+
-Dflink.version=1.19.0 \
84+
-Dflink.minor.version=1.19 \
85+
-Dflink.python.id=flink-python
86+
87+
- name: Build flink connector 1.20
88+
run: |
89+
cd flink-doris-connector && mvn clean package \
90+
-Dflink.version=1.20.0 \
91+
-Dflink.minor.version=1.20 \
92+
-Dflink.python.id=flink-python

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

+14-10
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.doris.flink.exception.DorisRuntimeException;
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
27+
import org.testcontainers.containers.BindMode;
2728
import org.testcontainers.containers.Container.ExecResult;
2829
import org.testcontainers.containers.GenericContainer;
2930
import org.testcontainers.containers.Network;
@@ -32,7 +33,6 @@
3233
import org.testcontainers.shaded.org.awaitility.Awaitility;
3334
import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException;
3435
import org.testcontainers.utility.DockerLoggerFactory;
35-
import org.testcontainers.utility.MountableFile;
3636

3737
import java.io.BufferedReader;
3838
import java.io.InputStream;
@@ -88,13 +88,14 @@ public GenericContainer<?> createDorisContainer() {
8888
"sh",
8989
"-c",
9090
"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")
91-
// use customer conf
92-
.withCopyFileToContainer(
93-
MountableFile.forClasspathResource("docker/doris/be.conf"),
94-
"/opt/apache-doris/be/conf/be.conf")
95-
.withCopyFileToContainer(
96-
MountableFile.forClasspathResource("docker/doris/fe.conf"),
97-
"/opt/apache-doris/fe/conf/fe.conf")
91+
.withClasspathResourceMapping(
92+
"docker/doris/be.conf",
93+
"/root/be/conf/be.conf",
94+
BindMode.READ_WRITE)
95+
.withClasspathResourceMapping(
96+
"docker/doris/fe.conf",
97+
"/root/fe/conf/fe.conf",
98+
BindMode.READ_WRITE)
9899
// These exposed ports are used to connect to Doris. They are the default
99100
// ports for yagagagaga/doris-standalone:2.1.7.
100101
// For more information, see:
@@ -107,8 +108,7 @@ public GenericContainer<?> createDorisContainer() {
107108
FE.FLIGHT_SQL_PORT,
108109
BE.FLIGHT_SQL_PORT)
109110
.withStartupTimeout(Duration.ofMinutes(5))
110-
.withEnv("TZ", systemTimeZone)
111-
.waitingFor(Wait.forListeningPort());
111+
.withEnv("TZ", systemTimeZone);
112112

113113
container.setPortBindings(
114114
Lists.newArrayList(
@@ -128,6 +128,10 @@ public void startContainer() {
128128
dorisContainer.start();
129129
// Wait for container to reach running state during first startup
130130
waitForContainerRunning();
131+
ExecResult feExecResult = dorisContainer.execInContainer("cat", "/root/fe/conf/fe.conf");
132+
ExecResult beExecResult = dorisContainer.execInContainer("cat", "/root/be/conf/be.conf");
133+
LOG.info("FE config: {}", feExecResult.getStdout());
134+
LOG.info("BE config: {}", beExecResult.getStdout());
131135
initializeJdbcConnection();
132136
initializeVariables();
133137
printClusterStatus();

0 commit comments

Comments
 (0)