This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/release-2.2.5-incubating-rc2
by this push:
new ee56a3b2 feat: update Dockerfile
ee56a3b2 is described below
commit ee56a3b2154ec1a9800e950c6ba8ed5a752778b6
Author: gaoxihui <[email protected]>
AuthorDate: Tue Feb 25 15:10:09 2025 +0800
feat: update Dockerfile
---
dist/dockerfiles/ozhera-app/Dockerfile | 1 +
dist/dockerfiles/ozhera-demo-client-server/Dockerfile | 1 +
dist/dockerfiles/ozhera-demo-server-server/Dockerfile | 1 +
dist/dockerfiles/ozhera-log-agent-server/Dockerfile | 1 +
dist/dockerfiles/ozhera-log-agent/Dockerfile | 1 +
dist/dockerfiles/ozhera-log-manager/Dockerfile | 1 +
dist/dockerfiles/ozhera-log-stream/Dockerfile | 1 +
dist/dockerfiles/ozhera-monitor/Dockerfile | 1 +
dist/dockerfiles/ozhera-operator/Dockerfile | 1 +
dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile | 1 +
dist/dockerfiles/ozhera-trace-etl-es/Dockerfile | 1 +
dist/dockerfiles/ozhera-trace-etl-manager/Dockerfile | 1 +
dist/dockerfiles/ozhera-trace-etl-server/Dockerfile | 1 +
dist/dockerfiles/ozhera-webhook/Dockerfile | 1 +
14 files changed, 14 insertions(+)
diff --git a/dist/dockerfiles/ozhera-app/Dockerfile
b/dist/dockerfiles/ozhera-app/Dockerfile
index 20f33a41..49247552 100644
--- a/dist/dockerfiles/ozhera-app/Dockerfile
+++ b/dist/dockerfiles/ozhera-app/Dockerfile
@@ -25,5 +25,6 @@ ARG LIB_PATH
ARG APP_VERSION
COPY ${SRC_PATH}/app-server-${APP_VERSION}.jar
/home/work/app-server/app-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "--enable-preview",
"--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/java.time=ALL-UNNAMED", "-cp",
"/home/work/app-server/app-server.jar:/home/work/lib/*",
"org.apache.ozhera.app.AppBootstrap"]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
b/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
index f9b3cdf1..f7574fbe 100644
--- a/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
+++ b/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
@@ -23,5 +23,6 @@ COPY ${SRC_PATH}/ozhera-demo-client-server-${APP_VERSION}.jar
/home/work/ozhera-
COPY ./opentelemetry-javaagent.jar /opt/soft/opentelemetry-javaagent.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-javaagent:/opt/soft/opentelemetry-javaagent.jar",
"-Dotel.exporter.prometheus.nacos.addr=nacos:80",
"-Dotel.exporter.log.pathprefix=/home/work/log/", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED", "--add- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
b/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
index 525fcf51..ed64a242 100644
--- a/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
+++ b/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
@@ -23,5 +23,6 @@ COPY ${SRC_PATH}/ozhera-demo-server-server-${APP_VERSION}.jar
/home/work/hera-de
COPY ./opentelemetry-javaagent.jar /opt/soft/opentelemetry-javaagent.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-javaagent:/opt/soft/opentelemetry-javaagent.jar",
"-Dotel.exporter.prometheus.nacos.addr=nacos:80",
"-Dotel.exporter.log.pathprefix=/home/work/log/", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED", "--add- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-log-agent-server/Dockerfile
b/dist/dockerfiles/ozhera-log-agent-server/Dockerfile
index e82fa613..ff21ef34 100644
--- a/dist/dockerfiles/ozhera-log-agent-server/Dockerfile
+++ b/dist/dockerfiles/ozhera-log-agent-server/Dockerfile
@@ -28,5 +28,6 @@ COPY ${SRC_PATH}/log-agent-server-${APP_VERSION}.jar
${APP_HOME}/log-agent-serve
WORKDIR ${APP_HOME}
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/java.time=ALL-UNNAMED", "-cp",
"/opt/app/log-agent-server.jar:/home/work/lib/*",
"org.apache.ozhera.log.server.LogAgentServerBootstrap"]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-log-agent/Dockerfile
b/dist/dockerfiles/ozhera-log-agent/Dockerfile
index 6ed50555..c4c1fda2 100644
--- a/dist/dockerfiles/ozhera-log-agent/Dockerfile
+++ b/dist/dockerfiles/ozhera-log-agent/Dockerfile
@@ -29,5 +29,6 @@ COPY ${SRC_PATH}/log-agent-${APP_VERSION}.jar
${APP_HOME}/log-agent.jar
WORKDIR ${APP_HOME}
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "--enable-preview",
"--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED", "-cp",
"/opt/app/log-agent.jar:/home/work/lib/*",
"org.apache.ozhera.log.agent.bootstrap.MiLogAgentBootstrap"]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-log-manager/Dockerfile
b/dist/dockerfiles/ozhera-log-manager/Dockerfile
index 2aec67ad..645d2c01 100644
--- a/dist/dockerfiles/ozhera-log-manager/Dockerfile
+++ b/dist/dockerfiles/ozhera-log-manager/Dockerfile
@@ -30,5 +30,6 @@ COPY ${SRC_PATH}/log-manager-${APP_VERSION}.jar
${APP_HOME}/log-manager.jar
WORKDIR ${APP_HOME}
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java",
"--enable-preview","--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/java.time=ALL-UNNAMED", "-cp",
"/opt/app/log-manager.jar:/home/work/lib/*",
"org.apache.ozhera.log.manager.bootstrap.MiLogManagerBootstrap"]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-log-stream/Dockerfile
b/dist/dockerfiles/ozhera-log-stream/Dockerfile
index 4768d21c..fc4c2cab 100644
--- a/dist/dockerfiles/ozhera-log-stream/Dockerfile
+++ b/dist/dockerfiles/ozhera-log-stream/Dockerfile
@@ -28,5 +28,6 @@ COPY ${SRC_PATH}/log-stream-${APP_VERSION}.jar
${APP_HOME}/log-stream.jar
WORKDIR ${APP_HOME}
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
CMD ["java", "--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.fs=ALL-UNNAMED", "-cp",
"/opt/app/log-stream.jar:/home/work/lib/*",
"org.apache.ozhera.log.stream.bootstrap.MiLogStreamBootstrap"]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-monitor/Dockerfile
b/dist/dockerfiles/ozhera-monitor/Dockerfile
index e88ae5d7..48b94fd0 100644
--- a/dist/dockerfiles/ozhera-monitor/Dockerfile
+++ b/dist/dockerfiles/ozhera-monitor/Dockerfile
@@ -20,5 +20,6 @@ ARG LIB_PATH
ARG APP_VERSION
COPY ${SRC_PATH}/ozhera-monitor-server-${APP_VERSION}.jar
/home/work/ozhera-monitor-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED",
"- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-operator/Dockerfile
b/dist/dockerfiles/ozhera-operator/Dockerfile
index c03a307f..eec79d28 100644
--- a/dist/dockerfiles/ozhera-operator/Dockerfile
+++ b/dist/dockerfiles/ozhera-operator/Dockerfile
@@ -19,5 +19,6 @@ ARG LIB_PATH
ARG APP_VERSION
COPY ${SRC_PATH}/ozhera-operator-server-${APP_VERSION}.jar
/home/work/ozhera-operator-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-XX:+UseZGC","--enable-preview",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED ",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.dv. [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile
b/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile
index fb2b4306..30036ec1 100644
--- a/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile
+++ b/dist/dockerfiles/ozhera-prometheus-agent-server/Dockerfile
@@ -22,5 +22,6 @@ ARG LIB_PATH
ARG APP_VERSION
COPY .${SRC_PATH}/ozhera-prometheus-agent-server-${APP_VERSION}.jar
/home/work/prometheus-agent/ozhera-prometheus-agent-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-Xms512M", "-Xmx512M", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl. [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-trace-etl-es/Dockerfile
b/dist/dockerfiles/ozhera-trace-etl-es/Dockerfile
index e8ee9494..5abb2214 100644
--- a/dist/dockerfiles/ozhera-trace-etl-es/Dockerfile
+++ b/dist/dockerfiles/ozhera-trace-etl-es/Dockerfile
@@ -21,5 +21,6 @@ ARG APP_VERSION
COPY ${SRC_PATH}/trace-etl-es-${APP_VERSION}.jar
/home/work/trace-etl-es/trace-etl-es.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED",
"- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-trace-etl-manager/Dockerfile
b/dist/dockerfiles/ozhera-trace-etl-manager/Dockerfile
index 2ed9c183..5a877a33 100644
--- a/dist/dockerfiles/ozhera-trace-etl-manager/Dockerfile
+++ b/dist/dockerfiles/ozhera-trace-etl-manager/Dockerfile
@@ -20,5 +20,6 @@ ARG APP_VERSION
COPY ${SRC_PATH}/trace-etl-manager-${APP_VERSION}.jar
/home/work/trace-etl-manager.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED",
"- [...]
diff --git a/dist/dockerfiles/ozhera-trace-etl-server/Dockerfile
b/dist/dockerfiles/ozhera-trace-etl-server/Dockerfile
index e6ffe6a4..f11417b0 100644
--- a/dist/dockerfiles/ozhera-trace-etl-server/Dockerfile
+++ b/dist/dockerfiles/ozhera-trace-etl-server/Dockerfile
@@ -21,5 +21,6 @@ ARG APP_VERSION
COPY ${SRC_PATH}/trace-etl-server-${APP_VERSION}.jar
/home/work/trace-etl-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT ["java", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED",
"- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-webhook/Dockerfile
b/dist/dockerfiles/ozhera-webhook/Dockerfile
index 9d50eefc..3c798269 100644
--- a/dist/dockerfiles/ozhera-webhook/Dockerfile
+++ b/dist/dockerfiles/ozhera-webhook/Dockerfile
@@ -20,5 +20,6 @@ ARG APP_VERSION
COPY ${SRC_PATH}/ozhera-webhook-server-${APP_VERSION}.jar
/home/work/hera-webhook-server.jar
COPY ${LIB_PATH}/lib /home/work/lib/
+COPY ${LIB_PATH}/ext-lib /home/work/lib/
ENTRYPOINT
["java","-Duser.timezone=Asia/Shanghai","-cp","/home/work/hera-webhook-server.jar:/home/work/lib/*","org.apache.ozhera.webhook.Bootstrap","&&","tail","-f","/dev/null"]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
