Prechádzať zdrojové kódy

HPCC-23624 eclccserver container won't start

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 rokov pred
rodič
commit
7bd40d7547

+ 2 - 2
dockerfiles/eclagent/Dockerfile

@@ -23,5 +23,5 @@ FROM hpccsystems/platform-core:${BUILD_LABEL}
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/eclagent
 WORKDIR /var/lib/HPCCSystems/eclagent
-RUN agentexec --init > eclagent.json
-ENTRYPOINT ["agentexec", "--config=eclagent.json"]
+RUN agentexec --init > eclagent.yaml
+ENTRYPOINT ["agentexec", "--config=eclagent.yaml"]

+ 2 - 2
dockerfiles/eclccserver/Dockerfile

@@ -23,5 +23,5 @@ FROM hpccsystems/platform-core:${BUILD_LABEL}
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/eclccserver
 WORKDIR /var/lib/HPCCSystems/eclccserver
-RUN eclccserver --init > eclccserver.json
-ENTRYPOINT [ "eclccserver", "--config=eclccserver.json" ]
+RUN eclccserver --init > eclccserver.yaml
+ENTRYPOINT [ "eclccserver", "--config=eclccserver.yaml" ]

+ 2 - 2
dockerfiles/roxie/Dockerfile

@@ -23,6 +23,6 @@ FROM hpccsystems/platform-core:${BUILD_LABEL}
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/roxie
 WORKDIR /var/lib/HPCCSystems/roxie
-RUN roxie --init > roxie.json
-ENTRYPOINT ["roxie", "--config=roxie.json"]
+RUN roxie --init > roxie.yaml
+ENTRYPOINT ["roxie", "--config=roxie.yaml"]
 

+ 2 - 2
dockerfiles/toposerver/Dockerfile

@@ -23,6 +23,6 @@ FROM hpccsystems/platform-core:${BUILD_LABEL}
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/toposerver
 WORKDIR /var/lib/HPCCSystems/toposerver
-RUN toposerver --init > toposerver.json
-ENTRYPOINT ["toposerver", "--config=toposerver.json"]
+RUN toposerver --init > toposerver.yaml
+ENTRYPOINT ["toposerver", "--config=toposerver.yaml"]
 

+ 9 - 9
ecl/eclccserver/eclccserver.cpp

@@ -746,15 +746,15 @@ void initSignals()
 }
 
 static constexpr const char * defaultYaml = R"!!(
- version: "1.0"
- EclCCServer:
-    daliServers: dali
-    enableEclccDali: true
-    enableSysLog: true
-    generatePrecompiledHeader: true
-    maxEclccProcesses: 4
-    name: myeclccserver
-    traceLevel: 1
+version: "1.0"
+EclCCServer:
+  daliServers: dali
+  enableEclccDali: true
+  enableSysLog: true
+  generatePrecompiledHeader: true
+  maxEclccProcesses: 4
+  name: myeclccserver
+  traceLevel: 1
 )!!";