diff --git a/computer-algorithm/Dockerfile b/computer-algorithm/Dockerfile deleted file mode 100644 index 7fc12cf1b..000000000 --- a/computer-algorithm/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# -# 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 hugegraph/hugegraph-computer:latest - -LABEL maintainer="HugeGraph Docker Maintainers " - -ARG jarFilePath="/opt/jars/hugegraph-builtin-algorithms.jar" -COPY target/computer-algorithm-*.jar ${jarFilePath} -ENV JAR_FILE_PATH=${jarFilePath} diff --git a/computer-dist/Dockerfile b/computer-dist/Dockerfile index c25fedd3c..d7649a64c 100644 --- 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 index 6cea0a97a..2e4835262 100644 --- a/computer-dist/pom.xml +++ b/computer-dist/pom.xml @@ -117,9 +117,9 @@ 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 index 9036b45bc..1cc0d6028 100755 --- 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