This is an automated email from the ASF dual-hosted git repository.
ming pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new b51443c7 fix: github action build docker image failed during the
release 1.2 process (#556)
b51443c7 is described below
commit b51443c7cd0633c448f3ef2339f8676cae1d95c7
Author: Dandelion <[email protected]>
AuthorDate: Wed Dec 13 16:01:14 2023 +0800
fix: github action build docker image failed during the release 1.2 process
(#556)
* test new dockerfile for append mvn args
* change arg name
* test hubble docker file
* remove apt-get
* install npm for npm run license
* change the var name to make it general
* change the position or maven args
---
hugegraph-hubble/Dockerfile | 17 +++++++++--------
hugegraph-loader/Dockerfile | 8 ++++----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile
index 2ae677a6..18c9a5c0 100644
--- a/hugegraph-hubble/Dockerfile
+++ b/hugegraph-hubble/Dockerfile
@@ -17,22 +17,23 @@
FROM maven:3.9.0-eclipse-temurin-11 AS build
-RUN set -x \
- && apt-get -q update \
- && apt-get install -y nodejs npm \
- && npm install --global yarn \
- && apt-get clean
+
+ARG MAVEN_ARGS
COPY . /pkg
WORKDIR /pkg
RUN set -x \
- && mvn install -pl hugegraph-client,hugegraph-loader -am
-Dmaven.javadoc.skip=true -DskipTests -ntp
+ && apt-get -q update \
+ && apt-get install -y npm \
+ && apt-get clean
RUN set -x \
- && cd /pkg/hugegraph-hubble/ \
- && mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true
+ && mvn install $MAVEN_ARGS -pl hugegraph-client,hugegraph-loader -am
-Dmaven.javadoc.skip=true -DskipTests -ntp
+RUN set -x \
+ && cd /pkg/hugegraph-hubble/ \
+ && mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true
FROM openjdk:11-slim
diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile
index 06985e70..fc4edfc2 100644
--- a/hugegraph-loader/Dockerfile
+++ b/hugegraph-loader/Dockerfile
@@ -20,15 +20,15 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build
COPY . /pkg
WORKDIR /pkg
-RUN set -x \
- && mvn install -pl hugegraph-client,hugegraph-loader -am
-Dmaven.javadoc.skip=true -DskipTests -ntp
+ARG MAVEN_ARGS
+RUN set -x \
+ && mvn install $MAVEN_ARGS -pl hugegraph-client,hugegraph-loader -am
-Dmaven.javadoc.skip=true -DskipTests -ntp
RUN set -x \
&& cd /pkg/hugegraph-loader/ \
&& echo "$(ls)" \
- && mvn clean package -DskipTests
-
+ && mvn clean package $MAVEN_ARGS -DskipTests
FROM openjdk:11-slim
