Fixup magento crons and catalog image process

Author: matthewbaggett

Alpine.fragment.Dockerfile

@@ -53,9 +53,10 @@ STOPSIGNAL SIGHUP
 CMD ["/usr/local/bin/entrypoint"]
 
 RUN <<FIXUP_BASH
-rm ~/.bashrc ~/.profile || true
-ln -s /etc/profile ~/.bashrc
-ln -s /etc/profile ~/.profile
+rm /root/.bashrc /root/.profile /home/app/.bashrc /home/app/.profile || true
+ln -s /etc/profile /root/.bashrc
+ln -s /etc/profile /root/.profile
+ln -s /etc/profile /home/app/.bashrc
+ln -s /etc/profile /home/app/.profile
 sed -i 's|/bin/ash|/bin/bash|' /etc/passwd
-FIXUP_BASH
-
+FIXUP_BASH

fs/magento/etc/services.d/cron/run

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+source $(dirname "$0")/../common.sh
+(
+	# wait until /etc/services.d/magento/done exists
+	if [ ! -f /etc/services.d/magento/done ]; then
+		echo "Waiting for Magento to be ready ..."
+		while [ ! -f /etc/services.d/magento/done ]; do
+			sleep 1
+		done
+	fi
+	# Run once first to populate cron lists
+	chpst -u app magento cron:run
+	# Start running cron
+	while true; do
+		chpst -u app magento cron:run
+		sleep 60
+	done
+) 2>&1 | (while IFS= read -r; do echo "${COLOR_RESET}[${DIR}] $REPLY"; done)

fs/magento/etc/services.d/magento/run

@@ -33,8 +33,8 @@ function runStartupTasks() {
 
 touch /etc/services.d/magento/starting
 fixCachePerms
-# if "magento" is executable
-if [ ! -x magento ]; then
+if [ $(which magento | wc -l) -eq 0 ]; then
+	rm /etc/services.d/magento/starting
 	echo "[$DIR] Error: '${COLOR_YELLOW}magento${COLOR_RESET}' utility binary is not detectable!"
 	echo "[$DIR]  You may need to add it to your ${COLOR_YELLOW}PATH${COLOR_RESET}."
 	echo "[$DIR]   PATH: ${COLOR_GREY}${PATH}${COLOR_RESET}"

fs/magento/etc/services.d/magento/tasks.d/010-magento-cron.sh

@@ -3,5 +3,5 @@ DIR="magento-images"
 source $(dirname "$0")/common
 (
 	echo "Generating Magento Catalog Images"
-	magento catalog:image:resize --async --skip_hidden_images
+	magento catalog:image:resize --async --quiet --skip_hidden_images
 ) 2>&1 | (while IFS= read -r; do echo "${COLOR_RESET}[${DIR}] $REPLY"; done)

fs/magento/etc/services.d/magento/tasks.d/080-magento-catalog-images.sh

@@ -64,4 +64,3 @@ if [ "$(whoami)" != "app" ]; then
 	exec su -s /bin/bash -c "$0" app
 	exit 0
 fi
-echo "Running as $(whoami) in $(pwd)"