Merge pull request #27 from nguyenmp/main

Synchronously run ./bin/control.sh setup to avoid race conditions when starting up with mounted data volume

README.md

@@ -18,7 +18,7 @@ Say goodbye to troublesome configuration and installation, and start your Schedu
 # use the latest version on DockerHub
 docker pull soulteary/cronicle
 # or specified version
-docker pull soulteary/cronicle:0.9.59
+docker pull soulteary/cronicle:0.9.61
 # Use GHCR mirror instead
 docker pull ghcr.io/soulteary/cronicle:latest
 ```

README_CN.md

@@ -18,7 +18,7 @@
 # 使用 DockerHub 最新版本
 docker pull soulteary/cronicle
 # 或者，使用指定版本
-docker pull soulteary/cronicle:0.9.59
+docker pull soulteary/cronicle:0.9.61
 # 使用 GHCR 镜像
 docker pull ghcr.io/soulteary/cronicle:latest
 ```

docker-compose.traefik.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
 
   cronicle:
-    image: soulteary/cronicle:0.9.59
+    image: soulteary/cronicle:0.9.61
     restart: always
     expose:
       - 3012

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
 
   cronicle:
-    image: soulteary/cronicle:0.9.59
+    image: soulteary/cronicle:0.9.61
     restart: always
     hostname: cronicle
     ports:

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM node:18-bullseye AS Builder
-ENV CRONICLE_VERSION=0.9.59
+ENV CRONICLE_VERSION=0.9.61
 WORKDIR /opt/cronicle
 RUN curl -L -o /tmp/Cronicle-${CRONICLE_VERSION}.tar.gz https://github.com/jhuckaby/Cronicle/archive/refs/tags/v${CRONICLE_VERSION}.tar.gz
 # COPY Cronicle-${CRONICLE_VERSION}.tar.gz /tmp/

docker/docker-entrypoint.js

@@ -6,22 +6,21 @@ if(require("fs").existsSync("./data/users") || process.env["IS_WORKER"] === "tru
 } else {
   const { existsSync, unlinkSync } = require("fs");
   const { dirname } = require("path");
-  const { exec } = require("child_process");
+  const { spawnSync } = require("child_process");
   const { hostname, networkInterfaces } = require("os");
   const StandaloneStorage = require("pixl-server-storage/standalone");
 
   if (existsSync("./logs/cronicled.pid")) unlinkSync("./logs/cronicled.pid");
 
   if (!existsSync("./data/users")) {
-    exec("/opt/cronicle/bin/control.sh setup", (error, stdout, stderr) => {
-      console.log("Storage init.");
-      if (error || stderr) {
-        console.log("init strorage failed");
-        console.log(error.message || stderr);
-        process.exit(1);
-      }
-      console.log(`stdout: ${stdout}`);
-    });
+    console.log("Storage init.");
+    const result = spawnSync("/opt/cronicle/bin/control.sh", ["setup"]);
+    if (result.error || result.stderr.length !== 0) {
+      console.log("init strorage failed");
+      console.log(result.error?.message || result.stderr.toString());
+      process.exit(1);
+    }
+    console.log(`stdout: ${result.stdout}`);
   }
 
   process.chdir(dirname(__dirname));