Backup-related fixes and improvements (#83)

* INITED was calculated wrong in the entrypoint
* we need to put both manticore.conf.sh and just manticore.conf to MANTICORE_CONFIG

Dockerfile

@@ -133,7 +133,7 @@ EXPOSE 9308
 EXPOSE 9312
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
-ENV MANTICORE_CONFIG="/etc/manticoresearch/manticore.conf.sh"
+ENV MANTICORE_CONFIG="/etc/manticoresearch/manticore.conf.sh|/etc/manticoresearch/manticore.conf"
 CMD ["searchd", "-c", "/etc/manticoresearch/manticore.conf.sh", "--nodetach"]
 
 # How to build manually:

docker-entrypoint.sh

@@ -241,14 +241,9 @@ _main() {
   fi
 
   BACKUP_INIT_FOLDER="/docker-entrypoint-initdb.d"
-  INITED=""
-  for f in /var/lib/manticore/*; do
-    INITED=1
-    break
-  done 
 
   if [ -f "${BACKUP_INIT_FOLDER}/versions.json" ]; then
-    if [ -n "$INITED" ]; then
+    if [ -f /var/lib/manticore/manticore.json ]; then
       echo "Warning: Backup is available for restore, but it's being skipped because it's already initialized or the data directory is not empty."
     else
       if [ ! -s "/usr/bin/manticore-executor" ]; then