This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 814625d1 feat: add dockerfile and proto file header (#515)
814625d1 is described below
commit 814625d144a86725fa936a936ca009b6001a04b2
Author: EricDing <[email protected]>
AuthorDate: Wed Nov 20 15:50:12 2024 +0800
feat: add dockerfile and proto file header (#515)
* fix: delete unused annotation
* fix: upgrade app-api and app-common version to 3
* fix: delete rocksDB unit test
* fix: update trace-etl file header, include java and md file
* fix: add trace-etl file header type, properties and xml
* fix: dockerfile and proto add file header
---
.../ozhera-demo-client-server/Dockerfile | 15 +++++++++++++++
.../src/main/proto/MyService.proto | 19 +++++++++++++++++++
.../ozhera-demo-server-server/Dockerfile | 15 +++++++++++++++
.../src/main/proto/MyService.proto | 19 +++++++++++++++++++
.../src/main/resources/Dockerfile | 15 +++++++++++++++
trace-etl/trace-etl-es/Dockerfile | 20 ++++++++++++++++++++
trace-etl/trace-etl-es/dockerfile | 5 -----
trace-etl/trace-etl-server/Dockerfile | 20 ++++++++++++++++++++
trace-etl/trace-etl-server/dockerfile | 5 -----
9 files changed, 123 insertions(+), 10 deletions(-)
diff --git a/ozhera-demo-client/ozhera-demo-client-server/Dockerfile
b/ozhera-demo-client/ozhera-demo-client-server/Dockerfile
index 7d8f0b44..7c94b7a6 100644
--- a/ozhera-demo-client/ozhera-demo-client-server/Dockerfile
+++ b/ozhera-demo-client/ozhera-demo-client-server/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
FROM openjdk:21-jdk-bookworm
RUN echo 'Asia/Shanghai' >/etc/timezone
diff --git
a/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto
b/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto
index 095028a7..1d0b0853 100644
---
a/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto
+++
b/ozhera-demo-client/ozhera-demo-client-server/src/main/proto/MyService.proto
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
syntax = "proto3";
package com.xiaomi.mone.hera.demo.grpc;
diff --git a/ozhera-demo-server/ozhera-demo-server-server/Dockerfile
b/ozhera-demo-server/ozhera-demo-server-server/Dockerfile
index 84c4a9e6..9b1d5ee3 100644
--- a/ozhera-demo-server/ozhera-demo-server-server/Dockerfile
+++ b/ozhera-demo-server/ozhera-demo-server-server/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
FROM openjdk:21-jdk-bookworm
RUN echo 'Asia/Shanghai' >/etc/timezone
diff --git
a/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto
b/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto
index 095028a7..1d0b0853 100644
---
a/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto
+++
b/ozhera-demo-server/ozhera-demo-server-server/src/main/proto/MyService.proto
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
syntax = "proto3";
package com.xiaomi.mone.hera.demo.grpc;
diff --git
a/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile
b/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile
index 7bc9bdf5..a3c2a5d9 100644
--- a/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile
+++ b/ozhera-demo-server/ozhera-demo-server-server/src/main/resources/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
FROM miserver
MAINTAINER [email protected]
RUN mkdir -p /home/work/zxw_test2/
diff --git a/trace-etl/trace-etl-es/Dockerfile
b/trace-etl/trace-etl-es/Dockerfile
new file mode 100644
index 00000000..0ea22336
--- /dev/null
+++ b/trace-etl/trace-etl-es/Dockerfile
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM openjdk:21-jdk-bookworm
+
+COPY ./target/trace-etl-es-1.0.1-jdk21.jar
/home/work/trace-etl-es/trace-etl-es-1.0.0-SNAPSHOT.jar
+
+ENTRYPOINT ["sh","-c","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
-Duser.timezone=Asia/ [...]
\ No newline at end of file
diff --git a/trace-etl/trace-etl-es/dockerfile
b/trace-etl/trace-etl-es/dockerfile
deleted file mode 100644
index 9887ede6..00000000
--- a/trace-etl/trace-etl-es/dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM openjdk:21-jdk-bookworm
-
-COPY ./target/trace-etl-es-1.0.1-jdk21.jar
/home/work/trace-etl-es/trace-etl-es-1.0.0-SNAPSHOT.jar
-
-ENTRYPOINT ["sh","-c","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
-Duser.timezone=Asia/ [...]
\ No newline at end of file
diff --git a/trace-etl/trace-etl-server/Dockerfile
b/trace-etl/trace-etl-server/Dockerfile
new file mode 100644
index 00000000..413c1b24
--- /dev/null
+++ b/trace-etl/trace-etl-server/Dockerfile
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM openjdk:21-jdk-bookworm
+
+COPY ./target/trace-etl-server-1.0.1-jdk21.jar
/home/work/trace-etl-server-1.0.0-SNAPSHOT.jar
+
+ENTRYPOINT ["sh","-c","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
-Duser.timezone=Asia/ [...]
\ No newline at end of file
diff --git a/trace-etl/trace-etl-server/dockerfile
b/trace-etl/trace-etl-server/dockerfile
deleted file mode 100644
index c9af710e..00000000
--- a/trace-etl/trace-etl-server/dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM openjdk:21-jdk-bookworm
-
-COPY ./target/trace-etl-server-1.0.1-jdk21.jar
/home/work/trace-etl-server-1.0.0-SNAPSHOT.jar
-
-ENTRYPOINT ["sh","-c","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
-Duser.timezone=Asia/ [...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
