v4.5.1 (#129)

Minor updates * Adding BF_ENABLE_INIT_CH to allow disabling permissions during init * Changing healthcheck definition to match [docs](https://docs.docker.com/engine/reference/builder/#healthcheck)
bfren · May 20, 2023 · a3f3050 · a3f3050
1 parent 4c0f4fd
commit a3f3050
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 15 deletions.
diff --git a/3.10/Dockerfile b/3.10/Dockerfile
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -40,13 +40,16 @@ 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
 
 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
@@ -1 +1 @@
-4.5.0
+4.5.1
diff --git a/edge/Dockerfile b/edge/Dockerfile
@@ -40,13 +40,16 @@ 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
 
 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
@@ -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