feat(cron): add support for entrypoints

features/src/cron/devcontainer-feature.json

@@ -2,7 +2,7 @@
     "id": "cron",
     "name": "Cron",
     "description": "Enables cron in the Dev Environment",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "options": {
         "enabled": {
             "type": "boolean",
@@ -18,9 +18,14 @@
             "type": "string",
             "default": "*/15 * * * *",
             "description": "Interval for wp-cron.php"
+        },
+        "install-runit-service": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether to install a runit service for cron"
         }
     },
     "installsAfter": [
-        "ghcr.io/automattic/vip-codespaces/wordpress"
+        "ghcr.io/automattic/vip-codespaces/entrypoints"
     ]
 }

features/src/cron/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/crond -l 8 -L /var/log/crond.log

features/src/cron/install.sh

@@ -10,8 +10,10 @@ if [ "$(id -u || true)" -ne 0 ]; then
 fi
 
 : "${_REMOTE_USER:?"_REMOTE_USER is required"}"
+: "${ENABLED:=true}"
+: "${INSTALL_RUNIT_SERVICE:=true}"
 
-if [ "${ENABLED:-}" = 'true' ]; then
+if [ "${ENABLED}" = 'true' ]; then
     echo '(*) Installing cron...'
 
     # shellcheck source=/dev/null
@@ -70,9 +72,15 @@ if [ "${ENABLED:-}" = 'true' ]; then
         ;;
     esac
 
-    install -D -m 0755 -o root -g root service-run /etc/sv/cron/run
-    install -d -m 0755 -o root -g root /etc/service
-    ln -sf /etc/sv/cron /etc/service/cron
+    if [ "${INSTALL_RUNIT_SERVICE}" = 'true' ] && [ -d /etc/sv ]; then
+        install -D -m 0755 -o root -g root service-run /etc/sv/cron/run
+        install -d -m 0755 -o root -g root /etc/service
+        ln -sf /etc/sv/cron /etc/service/cron
+    fi
+
+    if [ -d /var/lib/entrypoint.d ]; then
+        install -m 0755 -o root -g root entrypoint.sh /var/lib/entrypoint.d/50-cron
+    fi
 
     if [ "${RUN_WP_CRON:-}" = 'true' ] && [ -n "${WP_CRON_SCHEDULE:-}" ]; then
         install -m 0755 -o root -g root wp-cron.sh /usr/local/bin/wp-cron.sh

features/test/cron/alpine.sh

@@ -0,0 +1 @@
+alpine-base.sh

features/test/cron/checks.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
 
-check "cron is running" sudo sh -c 'sv status cron | grep -E ^run:'
-sudo sv stop cron
-check "cron is stopped" sudo sh -c 'sv status cron | grep -E ^down:'
-sudo sv start cron
-check "cron is running" sudo sh -c 'sv status cron | grep -E ^run:'
+if hash sv 2>/dev/null; then
+    check "cron is running" sudo sh -c 'sv status cron | grep -E ^run:'
+    sudo sv stop cron
+    check "cron is stopped" sudo sh -c 'sv status cron | grep -E ^down:'
+    sudo sv start cron
+    check "cron is running" sudo sh -c 'sv status cron | grep -E ^run:'
+    CRON_LOG=/var/log/messages
+else
+    check "cron is running" pgrep crond
+    CRON_LOG=/var/log/crond.log
+fi
 
-check "/var/log/messages has 'started' records" grep -E 'crond .* started' /var/log/messages
+check "/var/log/messages has 'started' records" grep -E 'crond .* started' "${CRON_LOG}"
 
 echo "* * * * * touch /tmp/cron-test" | crontab -
 ME=$(whoami)

features/test/cron/scenarios.json

@@ -6,12 +6,37 @@
             "cron": {}
         }
     },
-
     "ubuntu-base": {
         "image": "ghcr.io/automattic/vip-codespaces/ubuntu-base:latest",
         "overrideCommand": false,
         "features": {
             "cron": {}
         }
+    },
+    "alpine": {
+        "image": "mcr.microsoft.com/devcontainers/base:alpine",
+        "features": {
+            "entrypoints": {},
+            "cron": {
+                "install-runit-service": false
+            }
+        },
+        "overrideFeatureInstallOrder": [
+            "./entrypoints",
+            "./cron"
+        ]
+    },
+    "ubuntu": {
+        "image": "ubuntu:latest",
+        "features": {
+            "entrypoints": {},
+            "cron": {
+                "install-runit-service": false
+            }
+        },
+        "overrideFeatureInstallOrder": [
+            "./entrypoints",
+            "./cron"
+        ]
     }
 }

features/test/cron/ubuntu.sh

@@ -0,0 +1 @@
+alpine-base.sh