From 6f359ab3664053bf5f0709747ba66a26b9be3068 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 21 Nov 2020 14:40:05 +0100 Subject: [PATCH 1/3] Add .composer/vendir/bin to PATH variable --- CHANGELOG.md | 6 ++++++ Dockerfiles/work/Dockerfile-5.2 | 5 ++++- Dockerfiles/work/Dockerfile-5.3 | 5 ++++- Dockerfiles/work/Dockerfile-5.4 | 5 ++++- Dockerfiles/work/Dockerfile-5.5 | 5 ++++- Dockerfiles/work/Dockerfile-5.6 | 5 ++++- Dockerfiles/work/Dockerfile-7.0 | 5 ++++- Dockerfiles/work/Dockerfile-7.1 | 5 ++++- Dockerfiles/work/Dockerfile-7.2 | 5 ++++- Dockerfiles/work/Dockerfile-7.3 | 5 ++++- Dockerfiles/work/Dockerfile-7.4 | 5 ++++- Dockerfiles/work/Dockerfile-8.0 | 5 ++++- Dockerfiles/work/Dockerfile-8.1 | 5 ++++- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 5 ++++- 14 files changed, 58 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c8219e..a03370b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.117 + +#### Fixed +- [#755](https://github.com/cytopia/devilbox/issues/755) Add .composer/vendir/bin to PATH variable + + ## Release 0.116 #### Fixed diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c7a459c..9fea367 100644 --- 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 index ea878a5..0dca27d 100644 --- 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 index 9752b78..7b3ea3a 100644 --- 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 index 1966161..148d2a0 100644 --- 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 index 0d6b1f1..27c8bf6 100644 --- 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 index 97d6af7..7588b84 100644 --- 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 index 9e25bd0..f1c70ae 100644 --- 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 index d49a34f..741bfc3 100644 --- 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 index 1e065a1..a6ee655 100644 --- 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 index c11f929..7036b03 100644 --- 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 index 78570ab..b46b997 100644 --- 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 index 1997ea8..f4f9012 100644 --- 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/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index b3193be..8e6041b 100644 --- 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"; \ From 6f93613c3484468568047fba950c6ab2c8ac542b Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 21 Nov 2020 14:46:28 +0100 Subject: [PATCH 2/3] Fix GitHub Actions env vars --- .github/workflows/php-ci.yml | 6 +++--- .github/workflows/php-nightly.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php-ci.yml b/.github/workflows/php-ci.yml index a46dd42..25d55b2 100644 --- 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 index fa804d1..a37487f 100644 --- 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 # ------------------------------------------------------------ From b0c7655aca081a9fa97370e67fe6066606063710 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 21 Nov 2020 15:15:02 +0100 Subject: [PATCH 3/3] Add custom supervisor config mountpoint --- CHANGELOG.md | 5 ++++- Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh | 6 ++++++ Dockerfiles/prod/Dockerfile-5.2 | 4 +++- Dockerfiles/prod/Dockerfile-5.3 | 4 +++- Dockerfiles/prod/Dockerfile-5.4 | 4 +++- Dockerfiles/prod/Dockerfile-5.5 | 4 +++- Dockerfiles/prod/Dockerfile-5.6 | 4 +++- Dockerfiles/prod/Dockerfile-7.0 | 4 +++- Dockerfiles/prod/Dockerfile-7.1 | 4 +++- Dockerfiles/prod/Dockerfile-7.2 | 4 +++- Dockerfiles/prod/Dockerfile-7.3 | 4 +++- Dockerfiles/prod/Dockerfile-7.4 | 4 +++- Dockerfiles/prod/Dockerfile-8.0 | 4 +++- Dockerfiles/prod/Dockerfile-8.1 | 4 +++- Dockerfiles/prod/data/supervisord.conf | 2 +- README.md | 6 +++++- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 4 +++- 17 files changed, 55 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a03370b..d5c21ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ ## Release 0.117 #### Fixed -- [#755](https://github.com/cytopia/devilbox/issues/755) Add .composer/vendir/bin to PATH variable +- [#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 diff --git a/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh b/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh index bf8b162..3203fec 100755 --- 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 index 51ead67..d518f20 100644 --- 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 index aca7e4f..688934d 100644 --- 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 index dc63848..14d4cdc 100644 --- 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 index f6e013c..ce0b1fe 100644 --- 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 index c751edd..75fad6d 100644 --- 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 index 0dbe78e..ac99ba5 100644 --- 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 index d741b73..065b983 100644 --- 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 index 0b1f86c..3719631 100644 --- 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 index 571a2f2..a2a3039 100644 --- 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 index 1df70dd..68c79cf 100644 --- 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 index dda5c04..2882891 100644 --- 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 index d09ea53..a20270a 100644 --- 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 index 6b95366..1afe149 100644 --- 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/README.md b/README.md index 4a69a25..2e9224f 100644 --- 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 - prod

work + prod

work /etc/php-custom.d Mount this directory into your host computer and add custom \*.ini files in order to alter php behaviour. @@ -911,6 +911,10 @@ Have a look at the following table to see all offered volumes for each Docker im /var/mail Emails caught be the postfix catch-all (ENABLE_MAIL=2) will be available in this directory. + + /etc/supervisor/custom.d + Mount this directory into your host computer and add your own `*.conf` supervisor start-up files.

**Note:** Directory and file permission will be recursively set to this of `NEW_UID` and `NEW_GID`. + diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index e44ed93..9c173fd 100644 --- 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) \