Fix healthcheck

Author: MareStare

.devcontainer/init-container.sh

@@ -52,7 +52,7 @@ setup_rootless_docker
 
 philomena init
 
-step npm ci install --ignore-scripts
+step npm ci --ignore-scripts
 
 # Create an empty file which indicates to the healthcheck that the container
 # finished initializing. This precents race conditions with `docker exec` commands

docker/app/Dockerfile

@@ -130,8 +130,11 @@ ENTRYPOINT ["./.devcontainer/init-container.sh"]
 # Check for the presence of a special marker file that indicates that the
 # container has been initialized. Use a big `--interval` to "disable"
 # healthchecks after initialization completes.
-HEALTHCHECK --start-period=10s --start-interval=0.5s --interval=9999h \
-    CMD [ "test", "-f", "$HOME/.initialized" ]
+#
+# Also, don't be fooled - docker dosn't interpolate env vars in the CMD exec
+# form, so we explicitly use `bash -c` to expand the `$HOME` variable.
+HEALTHCHECK --start-period=10s --start-interval=0.5s --retries=1 --interval=9999h \
+    CMD [ "bash", "-c", "test -f $HOME/.initialized" ]
 
 # Make sure the process doesn't exit to keep the container alive
 CMD ["sleep", "infinity"]

scripts/lib.sh

@@ -118,19 +118,23 @@ function devcontainer_up {
   local status=$?
   set -e
 
+  # Ideally compose should stream the logs from the container while it's
+  # starting, unfortunately, this issue has been open for years:
+  # https://github.com/docker/compose/issues/9122
   if [[ "$status" = "0" ]]; then
-    return 0
+    info "Dumping the devcontainer logs..."
+  else
+    error "Failed to create the devcontainer. Dumping its logs below..."
   fi
 
-  error "Failed to create the devcontainer. Dumping its logs below..."
   step docker compose --file "$file" logs --no-log-prefix
 
   return "$status"
 }
 
 function devcontainer_forward {
   # Make sure the devcontainer is up and running.
-  if ! docker ps --all --format '{{.Names}}' | grep -wq philomena-devcontainer; then
+  if ! docker ps --filter "health=healthy" --format '{{.Names}}' | grep -wq philomena-devcontainer; then
     devcontainer_up
   fi