improve build image

apache · Nov 25, 2022 · cb5aaf2 · cb5aaf2
1 parent 67b7f9f
commit cb5aaf2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 30 deletions.
diff --git a/computer-algorithm/Dockerfile b/computer-algorithm/Dockerfile
diff --git a/computer-dist/Dockerfile b/computer-dist/Dockerfile
@@ -21,5 +21,6 @@ ENV JAVA_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseParallelGC -XX:+UseConta
 COPY ./bin /etc/local/hugegraph-computer/bin
 COPY ./lib /etc/local/hugegraph-computer/lib
 COPY ./algorithm /etc/local/hugegraph-computer/algorithm
+COPY ./conf /etc/local/hugegraph-computer/conf
 WORKDIR /etc/local/hugegraph-computer
 RUN apt-get update && apt-get -y install gettext-base && apt-get -y install wget
diff --git a/computer-dist/pom.xml b/computer-dist/pom.xml
@@ -117,9 +117,9 @@
                             <tasks>
                                 <echo file="${top.level.dir}/dist.sh">
                                     mkdir -p ${top.level.dir}/${final.name}/algorithm/
-                                    cp ${top.level.dir}/computer-algorithm/target/computer-algorithm-${project.version}.jar ${top.level.dir}/${final.name}/algorithm/
+                                    cp ${top.level.dir}/computer-algorithm/target/computer-algorithm-${project.version}.jar ${top.level.dir}/${final.name}/algorithm/builtin-algorithm.jar
                                     mkdir -p ${top.level.dir}/${final.name}/k8s-operator/
-                                    cp ${top.level.dir}/computer-k8s-operator/target/hugegraph-computer-operator-${project.version}.jar ${top.level.dir}/${final.name}/k8s-operator/
+                                    cp ${top.level.dir}/computer-k8s-operator/target/hugegraph-computer-operator-${project.version}.jar ${top.level.dir}/${final.name}/k8s-operator/hugegraph-computer-operator.jar
 
                                     tar -zcvf \
                                     ${top.level.dir}/${final.name}.tar.gz \

diff --git a/computer-dist/src/assembly/travis/build-images.sh b/computer-dist/src/assembly/travis/build-images.sh
@@ -20,7 +20,6 @@ set -ev
 BASE_DIR=$(cd "$(dirname "$0")" && pwd -P)
 PROJECT_PATH="$(cd "${BASE_DIR}/../../../.." && pwd -P)"
 PROJECT_POM_PATH="${PROJECT_PATH}/pom.xml"
-JAR_FILE_PATH=/opt/jars/hugegraph-builtin-algorithms.jar
 
 mvn -f "${PROJECT_POM_PATH}" clean package -DskipTests
 
@@ -29,10 +28,6 @@ CONTEXT_PATH=$(mvn -f "${PROJECT_POM_PATH}" -q -N \
     -Dexec.executable='echo' -Dexec.args='${final.name}')
     CONTEXT_PATH="${PROJECT_PATH}/${CONTEXT_PATH}"
 
-PROJECT_VERSION=$(mvn -f "${PROJECT_POM_PATH}" -q -N \
-    org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-    -Dexec.executable='echo' -Dexec.args='${project.version}')
-
 docker build -t $1 $CONTEXT_PATH -f $PROJECT_PATH/computer-dist/Dockerfile
 
 docker build -t $2 -f $PROJECT_PATH/computer-k8s-operator/Dockerfile $PROJECT_PATH/computer-k8s-operator