This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 4aae0686a [INLONG-5124][Docker] Add initial sort connectors to the
manager docker image (#5125)
4aae0686a is described below
commit 4aae0686a4b044b70211af7ec6087b9acb15e178
Author: Charles Zhang <[email protected]>
AuthorDate: Tue Jul 19 18:49:43 2022 +0800
[INLONG-5124][Docker] Add initial sort connectors to the manager docker
image (#5125)
---
docker/build-docker-images.sh | 3 +--
inlong-manager/manager-docker/Dockerfile | 12 ++++++++----
inlong-manager/manager-docker/pom.xml | 30 +++++++++++++++++++++++++++---
inlong-sort/sort-common/pom.xml | 2 --
pom.xml | 2 +-
5 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/docker/build-docker-images.sh b/docker/build-docker-images.sh
index 18e3fc51a..762494c4a 100644
--- a/docker/build-docker-images.sh
+++ b/docker/build-docker-images.sh
@@ -102,7 +102,6 @@
dataproxy_tarball="inlong-dataproxy/dataproxy-dist/target/${dataproxy_tarball_na
tubemq_manager_tarball="inlong-tubemq/tubemq-manager/target/${tubemq_manager_tarball_name}"
tubemq_all_tarball="inlong-tubemq/tubemq-server/target/${tubemq_all_tarball_name}"
-MANAGER_TARBALL="target/${manager_tarball_name}"
DATAPROXY_TARBALL="target/${dataproxy_tarball_name}"
AUDIT_TARBALL="target/${audit_tarball_name}"
TUBEMQ_MANAGER_TARBALL="target/${tubemq_manager_tarball_name}"
@@ -119,7 +118,7 @@ if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then
cp ${tubemq_all_tarball}
${tubemq_all_dockerfile_path}/target/${tubemq_all_tarball_name}
fi
-docker ${USE_BUILDX} build ${USE_PLATFORM} -t inlong/manager:${tag}
inlong-manager/manager-docker/ --build-arg
MANAGER_TARBALL=${MANAGER_TARBALL}
+docker ${USE_BUILDX} build ${USE_PLATFORM} -t inlong/manager:${tag}
inlong-manager/manager-docker/ --build-arg VERSION=${version}
docker ${USE_BUILDX} build ${USE_PLATFORM} -t inlong/dataproxy:${tag}
inlong-dataproxy/dataproxy-docker/ --build-arg
DATAPROXY_TARBALL=${DATAPROXY_TARBALL}
docker ${USE_BUILDX} build ${USE_PLATFORM} -t inlong/audit:${tag}
inlong-audit/audit-docker/ --build-arg AUDIT_TARBALL=${AUDIT_TARBALL}
docker ${USE_BUILDX} build ${USE_PLATFORM} -t inlong/tubemq-manager:${tag}
inlong-tubemq/tubemq-docker/tubemq-manager/ --build-arg
TUBEMQ_MANAGER_TARBALL=${TUBEMQ_MANAGER_TARBALL}
diff --git a/inlong-manager/manager-docker/Dockerfile
b/inlong-manager/manager-docker/Dockerfile
index 9ce14af57..87a3eb8a9 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -37,10 +37,14 @@ ENV AUDIT_PROXY_URL=127.0.0.1:10081
# JVM env
ENV MANAGER_JVM_HEAP_OPTS="-XX:+UseContainerSupport
-XX:InitialRAMPercentage=40.0 -XX:MaxRAMPercentage=80.0
-XX:-UseAdaptiveSizePolicy"
WORKDIR /opt/inlong-manager
-
-# add tarball from manager output
-ARG MANAGER_TARBALL
-ADD ${MANAGER_TARBALL} /opt/inlong-manager
+# add manager tarball
+ARG VERSION
+ADD target/manager-web-${VERSION}-bin.tar.gz /opt/inlong-manager
+# add sort resource
+ADD target/sort-dist-${VERSION}.jar /opt/inlong-sort/
+ADD target/sort-connector-pulsar-${VERSION}.jar /opt/inlong-sort/connectors/
+ADD target/sort-connector-jdbc-${VERSION}.jar /opt/inlong-sort/connectors/
+ADD target/sort-connector-hive-${VERSION}.jar /opt/inlong-sort/connectors/
# add mysql connector
RUN wget -P lib/
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.27/mysql-connector-java-8.0.27.jar
ADD manager-docker.sh bin/
diff --git a/inlong-manager/manager-docker/pom.xml
b/inlong-manager/manager-docker/pom.xml
index a45687933..00afecc5a 100644
--- a/inlong-manager/manager-docker/pom.xml
+++ b/inlong-manager/manager-docker/pom.xml
@@ -39,6 +39,28 @@
<type>tar.gz</type>
<scope>provided</scope>
</dependency>
+ <!-- copy sort-dist.jar to the manager-docker/target path -->
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-dist</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <!-- copy sort-connectors to the manager-docker/target path -->
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-connector-pulsar</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-connector-jdbc</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-connector-hive</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
<profiles>
@@ -74,7 +96,7 @@
<pullNewerImage>false</pullNewerImage>
<tag>${project.version}</tag>
<buildArgs>
-
<MANAGER_TARBALL>target/manager-web-${project.version}-bin.tar.gz</MANAGER_TARBALL>
+ <VERSION>${project.version}</VERSION>
</buildArgs>
</configuration>
</plugin>
@@ -90,8 +112,10 @@
</goals>
<phase>generate-resources</phase>
<configuration>
-
<outputDirectory>${project.build.directory}/</outputDirectory>
-
<includeArtifactIds>manager-web</includeArtifactIds>
+ <outputDirectory>target/</outputDirectory>
+ <includeArtifactIds>manager-web,
+ sort-dist,sort-connector-pulsar,
+
sort-connector-jdbc,sort-connector-hive</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
diff --git a/inlong-sort/sort-common/pom.xml b/inlong-sort/sort-common/pom.xml
index c67921c8d..a24959899 100644
--- a/inlong-sort/sort-common/pom.xml
+++ b/inlong-sort/sort-common/pom.xml
@@ -50,7 +50,6 @@
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -71,7 +70,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 227fe3b82..9d1051c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,9 +96,9 @@
<module>inlong-audit</module>
<module>inlong-dataproxy</module>
<module>inlong-agent</module>
- <module>inlong-manager</module>
<module>inlong-sort</module>
<module>inlong-sort-standalone</module>
+ <module>inlong-manager</module>
<module>inlong-dashboard</module>
<module>inlong-distribution</module>
</modules>
