fixing tests (again) + improving README

Author: Julien Neuhart

README.md

@@ -143,7 +143,7 @@ To do this, you need to configure 3 variables:
 # configure the user that will run cron (defaults to root)
 CRON_USER=root
 # configure the schedule for the cron job (here: run every minute)
-CRON_SCHEDULE=* * * * *
+CRON_SCHEDULE=* * * * * * *
 # last but not least, configure the command
 CRON_COMMAND=yarn run stuff
 ```
@@ -154,15 +154,15 @@ If you have more than one job to run, you can suffix your environment variable w
 
 ```bash
 CRON_USER_1=root
-CRON_SCHEDULE_1=* * * * *
+CRON_SCHEDULE_1=* * * * * * *
 CRON_COMMAND_1=yarn run stuff
 
 CRON_USER_2=www-data
-CRON_SCHEDULE_2=0 3 * * *
+CRON_SCHEDULE_2=* * * * * * *
 CRON_COMMAND_2=yarn run other-stuff
 ```
 
-**Important**: The cron runner we use is "Supercronic" and not the orginial "cron" that has a number of issues with containers. 
+**Important**: The cron runner we use is [Supercronic](https://github.com/aptible/supercronic) and not the orginial "cron" that has a number of issues with containers. 
 Even with Supercronic, the architecture of cron was never designed with Docker in mind (Cron is way older than Docker). It will run correctly on
 your container. If at some point you want to scale and add more containers, it will run on all your containers.
 At that point, if you only want to run a Cron task once for your application (and not once per container), you might

build-and-test.sh

@@ -19,14 +19,14 @@ RESULT=`docker run --rm -v $(pwd)/user1999:$CONTAINER_CWD thecodingmachine/nodej
 sudo rm -rf user1999
 
 # Let's check that the crons are actually sending logs in the right place
-RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="(>&1 echo "foobar")" thecodingmachine/nodejs:${BRANCH}-${VARIANT} -f Dockerfile.${VARIANT} sleep 1 2>&1 | grep -oP 'msg=foobar' | head -n1`
+RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="(>&1 echo "foobar")" thecodingmachine/nodejs:${BRANCH}-${VARIANT} sleep 1 2>&1 | grep -oP 'msg=foobar' | head -n1`
 [[ "$RESULT" = "msg=foobar" ]]
 
-RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="(>&2 echo "error")" thecodingmachine/nodejs:${BRANCH}-${VARIANT} -f Dockerfile.${VARIANT} sleep 1 2>&1 | grep -oP 'msg=error' | head -n1`
+RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="(>&2 echo "error")" thecodingmachine/nodejs:${BRANCH}-${VARIANT} sleep 1 2>&1 | grep -oP 'msg=error' | head -n1`
 [[ "$RESULT" = "msg=error" ]]
 
 # Let's check that the cron with a user different from root is actually run.
-RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="whoami" -e CRON_USER_1="docker" thecodingmachine/nodejs:${BRANCH}-${VARIANT} -f Dockerfile.${VARIANT} sleep 1 2>&1 | grep -oP 'msg=docker' | head -n1`
+RESULT=`docker run --rm -e CRON_SCHEDULE_1="* * * * * * *" -e CRON_COMMAND_1="whoami" -e CRON_USER_1="docker" thecodingmachine/nodejs:${BRANCH}-${VARIANT} sleep 1 2>&1 | grep -oP 'msg=docker' | head -n1`
 [[ "$RESULT" = "msg=docker" ]]
 
 echo "Tests passed with success"

utils/docker-entrypoint-as-root.sh

@@ -51,9 +51,7 @@ if [[ "$IMAGE_VARIANT" == "apache" ]]; then
     node /usr/local/bin/enable_apache_mods.js | bash
 fi
 
-# output on the logs can be done by writing on the "tini" PID. Useful for CRONTAB
-TINI_PID=`ps -e | grep tini | awk '{print $1;}'`
-node /usr/local/bin/generate_cron.js $TINI_PID > /tmp/generated_crontab
+node /usr/local/bin/generate_cron.js > /tmp/generated_crontab
 chmod 0644 /tmp/generated_crontab
 
 # If generated_crontab is not empty, start supercronic