From 9475b250eed1cb06605e6e3fcdf5c9ba4debb373 Mon Sep 17 00:00:00 2001 From: Dandelion Date: Tue, 12 Dec 2023 21:48:54 +0800 Subject: [PATCH 1/7] test new dockerfile for append mvn args --- hugegraph-hubble/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 2ae677a63..791218ade 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -23,15 +23,17 @@ RUN set -x \ && npm install --global yarn \ && apt-get clean +ARG MAVEN_PROFILE + COPY . /pkg WORKDIR /pkg RUN set -x \ - && mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp + && mvn install $MAVEN_PROFILE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp RUN set -x \ && cd /pkg/hugegraph-hubble/ \ - && mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true + && mvn package $MAVEN_PROFILE -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true FROM openjdk:11-slim From ee221320230dc80c29e0330c6cf18e791f5f756e Mon Sep 17 00:00:00 2001 From: Dandelion Date: Tue, 12 Dec 2023 22:10:16 +0800 Subject: [PATCH 2/7] change arg name --- hugegraph-hubble/Dockerfile | 6 +++--- hugegraph-loader/Dockerfile | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 791218ade..7f54bdf5f 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -23,17 +23,17 @@ RUN set -x \ && npm install --global yarn \ && apt-get clean -ARG MAVEN_PROFILE +ARG USE_STAGE COPY . /pkg WORKDIR /pkg RUN set -x \ - && mvn install $MAVEN_PROFILE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp + && mvn install $USE_STAGE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp RUN set -x \ && cd /pkg/hugegraph-hubble/ \ - && mvn package $MAVEN_PROFILE -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true + && mvn package $USE_STAGE -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true FROM openjdk:11-slim diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile index 06985e700..02cbeb080 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -20,14 +20,16 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build COPY . /pkg WORKDIR /pkg +ARG USE_STAGE + RUN set -x \ - && mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp + && mvn install $USE_STAGE -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 $USE_STAGE clean package -DskipTests FROM openjdk:11-slim From da1d71cccb52a1f039c0de79d93411fbfdcbb525 Mon Sep 17 00:00:00 2001 From: Dandelion Date: Tue, 12 Dec 2023 23:58:48 +0800 Subject: [PATCH 3/7] test hubble docker file --- hugegraph-hubble/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 7f54bdf5f..f83609359 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -19,7 +19,9 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build RUN set -x \ && apt-get -q update \ - && apt-get install -y nodejs npm \ + && apt-get install curl gnupg -yq \ + && curl -sL https://deb.nodesource.com/setup_16.x | bash \ + && apt-get install -y nodejs \ && npm install --global yarn \ && apt-get clean From 37339b76e3225d58b1d6e000fb5317c8357dcb8b Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 13 Dec 2023 00:10:31 +0800 Subject: [PATCH 4/7] remove apt-get --- hugegraph-hubble/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index f83609359..1efff8ba5 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -17,13 +17,6 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build -RUN set -x \ - && apt-get -q update \ - && apt-get install curl gnupg -yq \ - && curl -sL https://deb.nodesource.com/setup_16.x | bash \ - && apt-get install -y nodejs \ - && npm install --global yarn \ - && apt-get clean ARG USE_STAGE From 0fca949a3d0dfbedb62d58af5417ed83ebdb152d Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 13 Dec 2023 11:34:57 +0800 Subject: [PATCH 5/7] install npm for npm run license --- hugegraph-hubble/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 1efff8ba5..5164ae17c 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -23,6 +23,11 @@ ARG USE_STAGE COPY . /pkg WORKDIR /pkg +RUN set -x \ + && apt-get -q update \ + && apt-get install -y npm \ + && apt-get clean + RUN set -x \ && mvn install $USE_STAGE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp From 329bfcdbe3b9ed09f303884866582f0137077b69 Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 13 Dec 2023 11:55:05 +0800 Subject: [PATCH 6/7] change the var name to make it general --- hugegraph-hubble/Dockerfile | 7 +++---- hugegraph-loader/Dockerfile | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 5164ae17c..18c9a5c02 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -18,7 +18,7 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build -ARG USE_STAGE +ARG MAVEN_ARGS COPY . /pkg WORKDIR /pkg @@ -29,12 +29,11 @@ RUN set -x \ && apt-get clean RUN set -x \ - && mvn install $USE_STAGE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp + && 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 $USE_STAGE -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true - + && 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 02cbeb080..095a677f6 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -20,17 +20,15 @@ FROM maven:3.9.0-eclipse-temurin-11 AS build COPY . /pkg WORKDIR /pkg -ARG USE_STAGE +ARG MAVEN_ARGS RUN set -x \ - && mvn install $USE_STAGE -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp - + && 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 $USE_STAGE clean package -DskipTests - + && mvn $MAVEN_ARGS clean package -DskipTests FROM openjdk:11-slim From 4ffd1584a372880f9673e13640f836fd62e661ee Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 13 Dec 2023 12:02:32 +0800 Subject: [PATCH 7/7] change the position or maven args --- hugegraph-loader/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile index 095a677f6..fc4edfc29 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -28,7 +28,7 @@ RUN set -x \ RUN set -x \ && cd /pkg/hugegraph-loader/ \ && echo "$(ls)" \ - && mvn $MAVEN_ARGS clean package -DskipTests + && mvn clean package $MAVEN_ARGS -DskipTests FROM openjdk:11-slim