From 98600ef53877af98485ecdf31ce8bb328a1a274e Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 8 Nov 2023 18:56:48 +0800 Subject: [PATCH 1/2] feat: dockerfile adapt the project structure --- Dockerfile => hugegraph-server/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename Dockerfile => hugegraph-server/Dockerfile (82%) diff --git a/Dockerfile b/hugegraph-server/Dockerfile similarity index 82% rename from Dockerfile rename to hugegraph-server/Dockerfile index 7dcbf2131f..bebc8d0c0a 100644 --- a/Dockerfile +++ b/hugegraph-server/Dockerfile @@ -27,7 +27,7 @@ RUN mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l FROM openjdk:11-slim # TODO: get the version from the pom.xml ENV version=1.0.0 -COPY --from=build /pkg/apache-hugegraph-incubating-$version/ /hugegraph +COPY --from=build /pkg/hugegraph-server/apache-hugegraph-incubating-$version/ /hugegraph-server LABEL maintainer="HugeGraph Docker Maintainers " # TODO: use g1gc or zgc as default @@ -35,7 +35,7 @@ ENV JAVA_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport -XX:Max HUGEGRAPH_HOME="hugegraph" #COPY . /hugegraph/hugegraph-server -WORKDIR /hugegraph/ +WORKDIR /hugegraph-server/ # 1. Install environment RUN set -x \ @@ -50,17 +50,17 @@ RUN set -x \ # 2. Init HugeGraph Sever RUN set -e \ - && pwd && cd /hugegraph/ \ + && pwd && cd /hugegraph-server/ \ && sed -i "s/^restserver.url.*$/restserver.url=http:\/\/0.0.0.0:8080/g" ./conf/rest-server.properties # 3. Init docker script -COPY hugegraph-dist/docker/scripts/remote-connect.groovy ./scripts -COPY hugegraph-dist/docker/scripts/detect-storage.groovy ./scripts -COPY hugegraph-dist/docker/docker-entrypoint.sh . +COPY hugegraph-server/hugegraph-dist/docker/scripts/remote-connect.groovy ./scripts +COPY hugegraph-server/hugegraph-dist/docker/scripts/detect-storage.groovy ./scripts +COPY hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh . RUN chmod 755 ./docker-entrypoint.sh EXPOSE 8080 -VOLUME /hugegraph +VOLUME /hugegraph-server ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["./docker-entrypoint.sh"] From db76b5dbed7321867c1f055aad0c52185bf2f36a Mon Sep 17 00:00:00 2001 From: Dandelion Date: Wed, 8 Nov 2023 19:02:41 +0800 Subject: [PATCH 2/2] change the version --- hugegraph-server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-server/Dockerfile b/hugegraph-server/Dockerfile index bebc8d0c0a..93368487a9 100644 --- a/hugegraph-server/Dockerfile +++ b/hugegraph-server/Dockerfile @@ -26,7 +26,7 @@ RUN mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l # 2nd stage: runtime env FROM openjdk:11-slim # TODO: get the version from the pom.xml -ENV version=1.0.0 +ENV version=1.5.0 COPY --from=build /pkg/hugegraph-server/apache-hugegraph-incubating-$version/ /hugegraph-server LABEL maintainer="HugeGraph Docker Maintainers "