chore: add www-data user home to PATH

rewardenv · Nov 23, 2024 · c9e64d0 · c9e64d0
1 parent 2c65e97
commit c9e64d0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 9 deletions.
diff --git a/images/php-fpm-rootless/base/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/base/context/rootfs/docker-entrypoint.sh
@@ -99,7 +99,7 @@ else
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm-rootless/base/context/rootfs/etc/profile.d/path.sh b/images/php-fpm-rootless/base/context/rootfs/etc/profile.d/path.sh
@@ -6,5 +6,8 @@ fi
 ## support packages installed via pip into --user context
 export PATH=~/.local/bin:$PATH
 
+## support user binaries
+export PATH=~/bin:$PATH
+
 ## support packages installed via `composer global require <packages>`
 export PATH=~/.composer/vendor/bin:$PATH
diff --git a/images/php-fpm-rootless/base/tpl.Dockerfile b/images/php-fpm-rootless/base/tpl.Dockerfile
@@ -90,7 +90,7 @@ EOF
 WORKDIR /home/www-data
 USER www-data
 
-ENV PATH="/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:${PATH}"
+ENV PATH="/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/bin:/home/www-data/.local/bin:${PATH}"
 ENV N_PREFIX="/home/www-data/.local"
 
 COPY --from=composer:1 /usr/bin/composer /home/www-data/.local/bin/composer1

diff --git a/images/php-fpm-rootless/magento2-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/magento2-web/context/rootfs/docker-entrypoint.sh
@@ -99,7 +99,7 @@ else
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm-rootless/shopware-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/shopware-web/context/rootfs/docker-entrypoint.sh
@@ -99,7 +99,7 @@ else
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm-rootless/wordpress-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm-rootless/wordpress-web/context/rootfs/docker-entrypoint.sh
@@ -99,7 +99,7 @@ else
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/.composer/vendor/bin:/home/www-data/bin:/home/www-data/.local/bin:/var/www/html/node_modules/.bin:/home/www-data/node_modules/.bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm/base/context/rootfs/docker-entrypoint.sh b/images/php-fpm/base/context/rootfs/docker-entrypoint.sh
@@ -114,7 +114,7 @@ done
 sudo chown www-data:www-data /var/www/html
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm/base/context/rootfs/etc/profile.d/path.sh b/images/php-fpm/base/context/rootfs/etc/profile.d/path.sh
@@ -6,5 +6,8 @@ fi
 ## support packages installed via pip into --user context
 export PATH=~/.local/bin:$PATH
 
+## support user binaries
+export PATH=~/bin:$PATH
+
 ## support packages installed via `composer global require <packages>`
 export PATH=~/.composer/vendor/bin:$PATH
diff --git a/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh
@@ -105,7 +105,7 @@ if [ "${WWWDATA_PASSWORD}" != "" ]; then
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh
@@ -100,7 +100,7 @@ else
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab

diff --git a/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh
@@ -105,7 +105,7 @@ if [ "${WWWDATA_PASSWORD}" != "" ]; then
 fi
 
 if [ "${CRON_ENABLED:-false}" = "true" ]; then
-  printf "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
+  printf "PATH=/home/www-data/bin:/home/www-data/.local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\nSHELL=/bin/bash\n" |
     crontab -u www-data -
 
   # If CRONJOBS is set, write it to the crontab