Merge pull request #181 from devilbox/release-0.117

Release 0.117
devilbox · Nov 21, 2020 · 62c65d1 · 62c65d1
2 parents add92d6 + b0c7655
commit 62c65d1
Show file tree

Hide file tree

Showing 32 changed files with 118 additions and 34 deletions.
diff --git a/.github/workflows/php-ci.yml b/.github/workflows/php-ci.yml
@@ -104,9 +104,9 @@ jobs:
             fi
           fi
           # Export variable
-          # # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
-          echo ::set-env name=GIT_TYPE::${GIT_TYPE}
-          echo ::set-env name=GIT_SLUG::${GIT_SLUG}
+          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
+          echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV
+          echo "GIT_SLUG=${GIT_SLUG}" >> $GITHUB_ENV
 
 
       # ------------------------------------------------------------

diff --git a/.github/workflows/php-nightly.yml b/.github/workflows/php-nightly.yml
@@ -108,9 +108,9 @@ jobs:
             false
           fi
           # Export variable
-          # # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
-          echo ::set-env name=GIT_TYPE::${GIT_TYPE}
-          echo ::set-env name=GIT_SLUG::${GIT_SLUG}
+          # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files
+          echo "GIT_TYPE=${GIT_TYPE}" >> $GITHUB_ENV
+          echo "GIT_SLUG=${GIT_SLUG}" >> $GITHUB_ENV
 
 
       # ------------------------------------------------------------

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@
 ## Unreleased
 
 
+## Release 0.117
+
+#### Fixed
+- [#755](https://github.com/cytopia/devilbox/issues/755) Add .composer/vendir/bin to $PATH variable
+
+#### Added
+- [#692](https://github.com/cytopia/devilbox/issues/692) Add custom supervisor config mountpoint
+
+
 ## Release 0.116
 
 #### Fixed

diff --git a/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh b/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh
@@ -69,6 +69,9 @@ set_uid() {
 			if [ -f "/var/spool/mail/devilbox" ]; then
 				run "chown -R ${username} /var/spool/mail/devilbox" "${debug}"
 			fi
+			if [ -d "/etc/supervisor/custom.d" ]; then
+				run "chown -R ${username} /etc/supervisor/custom.d" "${debug}"
+			fi
 		fi
 	fi
 }
@@ -116,6 +119,9 @@ set_gid() {
 			if [ -f "/var/spool/mail/devilbox" ]; then
 				run "chown -R :${groupname} /var/spool/mail/devilbox" "${debug}"
 			fi
+			if [ -d "/etc/supervisor/custom.d" ]; then
+				run "chown -R :${groupname} /etc/supervisor/custom.d" "${debug}"
+			fi
 		fi
 	fi
 }

diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-8.0 b/Dockerfiles/prod/Dockerfile-8.0
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/Dockerfile-8.1 b/Dockerfiles/prod/Dockerfile-8.1
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/Dockerfiles/prod/data/supervisord.conf b/Dockerfiles/prod/data/supervisord.conf
@@ -6,4 +6,4 @@ pidfile     = /var/run/supervisord.pid
 childlogdir = /var/log/supervisor
 
 [include]
-files = /etc/supervisor/conf.d/*.conf
+files = /etc/supervisor/conf.d/*.conf /etc/supervisor/custom.d/*.conf
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -411,7 +411,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -472,7 +472,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -506,7 +506,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -524,7 +524,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -535,7 +535,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -535,7 +535,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -535,7 +535,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -536,7 +536,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -536,7 +536,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -531,7 +531,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
@@ -435,7 +435,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
@@ -435,7 +435,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

diff --git a/README.md b/README.md
@@ -883,7 +883,7 @@ Have a look at the following table to see all offered volumes for each Docker im
  </thead>
  <tbody>
   <tr>
-   <td rowspan="7"><strong>prod</strong><br/><br/><strong>work</strong></td>
+   <td rowspan="8"><strong>prod</strong><br/><br/><strong>work</strong></td>
    <td><code>/etc/php-custom.d</code></td>
    <td>Mount this directory into your host computer and add custom <code>\*.ini</code> files in order to alter php behaviour.</td>
   </tr>
@@ -911,6 +911,10 @@ Have a look at the following table to see all offered volumes for each Docker im
    <td><code>/var/mail</code></td>
    <td>Emails caught be the postfix catch-all (<code>ENABLE_MAIL=2</code>) will be available in this directory.</td>
   </tr>
+  <tr>
+   <td><code>/etc/supervisor/custom.d</code></td>
+   <td>Mount this directory into your host computer and add your own `*.conf` supervisor start-up files.<br/><br/>**Note:** Directory and file permission will be recursively set to this of `NEW_UID` and `NEW_GID`.</td>
+  </tr>
   <tr>
    <td colspan="3"></td>
   </tr>

diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2
@@ -40,8 +40,10 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& rm -rf /etc/supervisor* \
-	&& mkdir -p /etc/supervisor/conf.d \
 	&& mkdir -p /var/log/supervisor \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /etc/supervisor/custom.d \
+	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \

diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -428,7 +428,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:\${HOME}/.yarn/bin:/opt/nvm/versions/node/\$(nvm version default)/bin"; \
+		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
+		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
+		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
+		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \