init store in entrypoint

Author: aroundabout

hugegraph-server/Dockerfile

@@ -49,9 +49,12 @@ RUN set -x \
        curl \
        lsof \
        vim \
+       cron \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+RUN service cron start
+
 # 2. Init HugeGraph Sever
 RUN set -e \
     && pwd && cd /hugegraph-server/ \
@@ -61,10 +64,12 @@ 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", "--"]
+ENTRYPOINT ["/usr/bin/dumb-init", "--" ,"/bin/bash", "docker-init.sh"]
 CMD ["./docker-entrypoint.sh"]

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

@@ -16,23 +16,6 @@
 # under the License.
 #
 
-# wait for storage like cassandra
-./bin/wait-storage.sh
-
-# set auth if needed 
-if [[ $AUTH == "true" ]]; then
-    # set password if use do not provide
-    if [ -z "$PASSWORD" ]; then
-        echo "you have not set the password, we will use the default password"
-        PASSWORD="hugegraph"
-    fi
-    echo "init hugegraph with auth"
-    ./bin/enable-auth.sh
-    echo "$PASSWORD" | ./bin/init-store.sh
-else
-    ./bin/init-store.sh
-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

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# 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.
+#
+
+# 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