From 88bed2bc4ace4395e5e43fa84ea982ed2dccd738 Mon Sep 17 00:00:00 2001
From: Omar Ahmad <omar.ahmad@cis.ntt.com>
Date: Wed, 23 Dec 2020 13:22:15 -0500
Subject: [PATCH] Fixing entrypoint dealing with JSON mapping

---
 config-samples/config.sample.mapping.json | 30 ++++++++---------------
 docker-entrypoint                         | 10 ++++----
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/config-samples/config.sample.mapping.json b/config-samples/config.sample.mapping.json
index 9716937..3b30a2c 100644
--- a/config-samples/config.sample.mapping.json
+++ b/config-samples/config.sample.mapping.json
@@ -1,48 +1,38 @@
-[
-  {
+{
+  "cron with triggered commands": {
     "comment": "cron with triggered commands",
     "schedule": "* * * * *",
     "command": "echo hello",
     "project": "crontab",
     "container": "myapp",
-    "trigger": [
-      {
-        "command": "echo world",
-        "container": "crontab_myapp_1"
-      }
-    ]
+    "trigger": [{ "command": "echo world", "container": "crontab_myapp_1" }]
   },
-  {
+  "map a volume": {
     "comment": "map a volume",
     "schedule": "* * * * *",
     "dockerargs": "-d -v /tmp:/tmp",
     "command": "echo new",
     "image": "alpine:3.5"
   },
-  {
+  "use an ENV from inside a container": {
     "comment": "use an ENV from inside a container",
     "schedule": "@hourly",
     "dockerargs": "-d -e FOO=BAR",
     "command": "sh -c 'echo hourly ${FOO}'",
     "image": "alpine:3.5"
   },
-  {
+  "trigger every 2 min": {
     "comment": "trigger every 2 min",
     "schedule": "@every 2m",
     "command": "echo 2 minute",
     "image": "alpine:3.5",
-    "trigger": [
-      {
-        "command": "echo world",
-        "container": "crontab_myapp_1"
-      }
-    ]
+    "trigger": [{ "command": "echo world", "container": "crontab_myapp_1" }]
   },
-  {
+  "null": {
     "schedule": "*/5 * * * *",
     "command": "/usr/sbin/logrotate /etc/logrotate.conf"
   },
-  {
+  "Regenerate Certificate then reload nginx": {
     "comment": "Regenerate Certificate then reload nginx",
     "schedule": "43 6,18 * * *",
     "command": "sh -c 'dehydrated --cron --out /etc/ssl --domain ${LE_DOMAIN} --challenge dns-01 --hook dehydrated-dns'",
@@ -57,4 +47,4 @@
     ],
     "onstart": true
   }
-]
+}
diff --git a/docker-entrypoint b/docker-entrypoint
index f2551bb..2696ee5 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -17,9 +17,7 @@ fi
 
 get_config() {
     if [ -f "${HOME_DIR}/config.json" ]; then
-        cp ${HOME_DIR}/config.json ${HOME_DIR}/config.json.old
-        jq 'map(.)' ${HOME_DIR}/config.json.old > ${HOME_DIR}/config.json
-        rm ${HOME_DIR}/config.json.old
+        jq 'map(.)' ${HOME_DIR}/config.json > ${HOME_DIR}/config.working.json
     elif [ -f "${HOME_DIR}/config.toml" ]; then
         rq -t <<< $(cat ${HOME_DIR}/config.toml) | jq 'map(.)' > ${HOME_DIR}/config.json
     elif [ -f "${HOME_DIR}/config.yml" ]; then
@@ -265,8 +263,10 @@ ensure_docker_socket_accessible
 
 start_app() {
     get_config
-    if [ -f "${HOME_DIR}/config.json" ]; then
-        export CONFIG=${HOME_DIR}/config.json
+    if [ -f "${HOME_DIR}/config.working.json" ]; then
+        export CONFIG=${HOME_DIR}/config.working.json
+    elif [ -f "${HOME_DIR}/config.json" ]; then
+         export CONFIG=${HOME_DIR}/config.json
     else
         echo "NO CONFIG FILE FOUND"
     fi