Various fixes to scripts and conf

scripts/0.start_dls.sh

@@ -1,34 +1,49 @@
 #!/bin/bash
 #
-CTR_NAME=dls
+D2C_CTR_NAME=dir2config
+DLS_CTR_NAME=dls
+# Admin token to unlock the DLS store
+DLS_UNLOCK_TOKEN=changeme
 #
 #
-set -xe
-IMG=mcluseau/dkl-local-server:beta
+D2C_IMG=novit.tech/direktil/local-server:b6fa941
+DLS_IMG=novit.tech/direktil/local-server:b6fa941
+
+prereqs_dls() {
+  command -v docker 1>/dev/null || perror "Docker is needed, please install it and run again."
+  systemctl is-active docker &>/dev/null || systemctl start docker
+  docker pull $DLS_IMG
+}
+
+dir2config() {
+  pinfo "Generating config.yaml from Direktil configuration"
+  docker run --rm --name $D2C_CTR_NAME \
+    -v .:/var/lib/direktil -w /var/lib/direktil \
+    --entrypoint=/bin/dkl-dir2config \
+    $D2C_IMG
+}
 
 start_store() {
-  set +e
-  docker stop $CTR_NAME &>/dev/null
-  docker wait $CTR_NAME &>/dev/null
-  set -e
-  docker run --rm --name $CTR_NAME --net host \
+  if docker ps|grep " $DLS_CTR_NAME$" ; then
+    pinfo "Container $DLS_CTR_NAME seems already running"
+    return
+  fi
+  docker run --rm --name $DLS_CTR_NAME -p 7606:7606 \
       -e http_proxy=$http_proxy \
       -e https_proxy=$https_proxy \
       -e HTTP_PROXY=$HTTP_PROXY \
       -e HTTPS_PROXY=$HTTPS_PROXY \
-      -v $ctxdir:/var/lib/direktil \
-      $IMG &
+      -v .:/var/lib/direktil \
+      $DLS_IMG &
 #      -auto-unlock 'N0v!T'
-      sleep 2
+  sleep 2
 }
 
-
-source .common
-
-command -v docker 1>/dev/null || perror "Docker is needed, please install it and run again."
-systemctl is-active docker &>/dev/null || systemctl start docker
-
+source $(dirname $0)/.common
+check_root
+prereqs_dls
 prereqs
+dir2config
 start_store
 unlock_store