diff --git a/3.10/Dockerfile b/3.10/Dockerfile index 032f11e2..0a346b55 100644 --- a/3.10/Dockerfile +++ b/3.10/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.11/Dockerfile b/3.11/Dockerfile index 650bf2d8..b60cc5d5 100644 --- a/3.11/Dockerfile +++ b/3.11/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.12/Dockerfile b/3.12/Dockerfile index f37ec673..3e9c6a13 100644 --- a/3.12/Dockerfile +++ b/3.12/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.13/Dockerfile b/3.13/Dockerfile index e0eb5998..fa282441 100644 --- a/3.13/Dockerfile +++ b/3.13/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.14/Dockerfile b/3.14/Dockerfile index 0bec27d9..7ec87043 100644 --- a/3.14/Dockerfile +++ b/3.14/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.15/Dockerfile b/3.15/Dockerfile index 3f132f5d..0fbd3c75 100644 --- a/3.15/Dockerfile +++ b/3.15/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.16/Dockerfile b/3.16/Dockerfile index dbe3ace4..28ed8d70 100644 --- a/3.16/Dockerfile +++ b/3.16/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.17/Dockerfile b/3.17/Dockerfile index 0ae73305..6eccf099 100644 --- a/3.17/Dockerfile +++ b/3.17/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.18/Dockerfile b/3.18/Dockerfile index 7d54468a..72d25073 100644 --- a/3.18/Dockerfile +++ b/3.18/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.8/Dockerfile b/3.8/Dockerfile index a0f1cebc..3379eb7d 100644 --- a/3.8/Dockerfile +++ b/3.8/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/3.9/Dockerfile b/3.9/Dockerfile index e266ace3..b1176154 100644 --- a/3.9/Dockerfile +++ b/3.9/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/Dockerfile.esh b/Dockerfile.esh index 7be019b9..6bf4d93f 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/VERSION b/VERSION index ae153944..99523d47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.0 \ No newline at end of file +4.5.1 \ No newline at end of file diff --git a/edge/Dockerfile b/edge/Dockerfile index 89269746..39d3b624 100644 --- a/edge/Dockerfile +++ b/edge/Dockerfile @@ -40,6 +40,8 @@ ENV \ ENV \ # cron log levels are from 0 (most verbose) to 8 (default) BF_CRON_LOG_LEVEL=8 \ + # set to 0 to disable setting permissions using ch.d during init phase + BF_ENABLE_INIT_CH=1 \ # disable S6 Overlay service timeout - handle by timeout-up instead S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -47,6 +49,7 @@ COPY ./overlay / RUN bf-install -HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 CMD [ "healthcheck" ] +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=5 \ + CMD healthcheck ENTRYPOINT [ "/init" ] diff --git a/overlay/etc/bf/init.d/02-ch b/overlay/etc/bf/init.d/02-ch index ee837519..5623de39 100644 --- a/overlay/etc/bf/init.d/02-ch +++ b/overlay/etc/bf/init.d/02-ch @@ -5,9 +5,14 @@ export BF_E=`basename ${0}` #====================================================================================================================== -# Apply ch files. +# Apply ch files unless disabled. #====================================================================================================================== +if [ ! "${BF_ENABLE_INIT_CH}" = "1" ] ; then + bf-echo "Applying ch.d during init is disabled." + exit 0 +fi + for FILE in `ls ${BF_CH_D} | sort` ; do bf-ch-apply "${BF_CH_D}/${FILE}" done