use flag file to skip re-init

Author: aroundabout

hugegraph-server/Dockerfile

@@ -28,9 +28,8 @@ RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true &&
 # 2nd stage: runtime env
 # remove zgc, which is only available on ARM-Mac with java > 13 
 FROM openjdk:11-slim
-# TODO: get the version from the pom.xml
-ENV version=1.2.0
-COPY --from=build /pkg/hugegraph-server/apache-hugegraph-incubating-$version/ /hugegraph-server
+
+COPY --from=build /pkg/hugegraph-server/apache-hugegraph-incubating-*/ /hugegraph-server
 LABEL maintainer="HugeGraph Docker Maintainers <dev@hugegraph.apache.org>"
 
 # TODO: use g1gc or zgc as default
@@ -64,12 +63,10 @@ RUN set -e \
 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 .
-COPY hugegraph-server/hugegraph-dist/docker/docker-init.sh .
 RUN chmod 755 ./docker-entrypoint.sh 
-RUN chmod 755 ./docker-init.sh
 
 EXPOSE 8080
 VOLUME /hugegraph-server
 
-ENTRYPOINT ["/usr/bin/dumb-init", "--" ,"/bin/bash", "docker-init.sh"]
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["./docker-entrypoint.sh"]

hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh

@@ -16,6 +16,28 @@
 # under the License.
 #
 
+# create a folder to save the docker-related file
+DOCKER_FOLDER='./docker'
+mkdir -p $DOCKER_FOLDER
+
+INIT_FLAG_FILE="init_complete"
+
+if [ ! -f "${DOCKER_FOLDER}/${INIT_FLAG_FILE}" ]; then
+    # wait for storage backend
+    ./bin/wait-storage.sh
+    if [ -z "$PASSWORD" ]; then
+        ./bin/init-store.sh
+    else
+        echo "init hugegraph with auth"
+        ./bin/enable-auth.sh
+        echo "$PASSWORD" | ./bin/init-store.sh
+    fi
+    # create a flag file to avoid re-init when restarting
+    touch ${DOCKER_FOLDER}/${INIT_FLAG_FILE}
+else
+    echo "Hugegraph Initialization already done. Skipping re-init..."
+fi
+
 # start hugegraph
 # remove "-g zgc" now, which is only available on ARM-Mac with java > 13 
 ./bin/start-hugegraph.sh -j "$JAVA_OPTS" 

hugegraph-server/hugegraph-dist/docker/docker-init.sh

@@ -139,6 +139,9 @@ function wait_for_startup() {
         process_status "$server_name" "$pid" >/dev/null
         if [ $? -eq 1 ]; then
             echo "Starting $server_name failed"
+            if [ -e "$error_file_name" ]; then
+                rm "$error_file_name"
+            fi
             return 1
         fi