Merge branch 'candidate-8.2.x' into candidate-8.4.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

.devcontainer/Dockerfile

@@ -0,0 +1,3 @@
+ARG BASE_VER=8.6 
+
+FROM hpccsystems/platform-build-base:${BASE_VER}

.devcontainer/devcontainer.json

@@ -0,0 +1,32 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/cpp
+{
+	"name": "C++",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			"BASE_VER": "7.12"
+		}
+	},
+	"runArgs": [
+		"--cap-add=SYS_PTRACE",
+		"--security-opt",
+		"seccomp=unconfined"
+	],
+	// "postCreateCommand": "git config oh-my-zsh.hide-info 1",
+	// Set *default* container specific settings.json values on container create.
+	"settings": {},
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-vscode.cpptools",
+		"ms-vscode.cmake-tools",
+		"twxs.cmake"
+	],
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "gcc -v",
+	"initializeCommand": "git submodule update --init --recursive"
+	// Comment out this line to run as root instead.
+	// "remoteUser": "vscode"
+}

.gitignore

@@ -1,4 +1,5 @@
 build/
+node_modules/
 vcpkg/
 externals/
 .project

dali/base/dafdesc.cpp

@@ -3516,7 +3516,9 @@ void initializeStorageGroups(bool createPlanesFromGroups)
         PROGLOG("initializeStorageGroups update");
         doInitializeStorageGroups(createPlanesFromGroups);
     };
-    configUpdateHook.installOnce(updateFunc, true);
+
+    doInitializeStorageGroups(createPlanesFromGroups);
+    configUpdateHook.installOnce(updateFunc, false);
 }
 
 bool getDefaultStoragePlane(StringBuffer &ret)

dali/server/daserver.cpp

@@ -475,6 +475,7 @@ int main(int argc, const char* argv[])
 
         for (unsigned i=1;i<(unsigned)argc;i++) {
             if (streq(argv[i],"--daemon") || streq(argv[i],"-d")) {
+                i++; // consumed within checkCreateDaemon(), bump up here
             }
             else if (streq(argv[i],"--server") || streq(argv[i],"-s"))
                 server = argv[++i];

package-lock.json

@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}