From b0c7655aca081a9fa97370e67fe6066606063710 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 21 Nov 2020 15:15:02 +0100 Subject: [PATCH] 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) \