From 8307f99535f0dbde0c83e014b03822b8833e94c0 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Fri, 18 Feb 2022 13:55:03 +0000 Subject: [PATCH 1/4] Bumping version to 3.0.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d9c62ed..282895a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.2 \ No newline at end of file +3.0.3 \ No newline at end of file From 0ddcdad0d2051a2df18c5852931ec58f050cc84d Mon Sep 17 00:00:00 2001 From: Ben Green Date: Fri, 18 Feb 2022 13:55:13 +0000 Subject: [PATCH 2/4] Adding fix for bf-ch-apply --- overlay/usr/bin/bf/bf-ch-apply | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 overlay/usr/bin/bf/bf-ch-apply diff --git a/overlay/usr/bin/bf/bf-ch-apply b/overlay/usr/bin/bf/bf-ch-apply new file mode 100644 index 0000000..6881ed6 --- /dev/null +++ b/overlay/usr/bin/bf/bf-ch-apply @@ -0,0 +1,32 @@ +#!/bin/sh + +set -euo pipefail + + +#====================================================================================================================== +# Ensure file exists. +#====================================================================================================================== + +[[ -z "${1-}" ]] && bf-error "You must pass a file to apply." "bf-ch-apply" +FILE=${1} + +[[ ! -f "${FILE}" ]] && bf-error "${FILE} is not a file." "bf-ch-apply" + + +#====================================================================================================================== +# Apply ch file. +#====================================================================================================================== + +bf-echo "Applying ${FILE}..." "bf-ch-apply" + +while read GLOB OWNER FMODE DMODE ; do + + [[ -z "${GLOB-}" ]] && continue + + bf-ch -o ${OWNER} -r ${GLOB} + [[ -n "${FMODE}" ]] && bf-ch -m ${FMODE} -t f ${GLOB} + [[ -n "${DMODE}" ]] && bf-ch -m ${DMODE} -t d ${GLOB} + +done < "${FILE}" + +bf-debug "done." "bf-ch-apply" From 4cec014657ee99e680fc9b82d4af1bafae705196 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Fri, 18 Feb 2022 16:18:17 +0000 Subject: [PATCH 3/4] Using latest base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d7c33ec..866dd0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/nginx:nginx1.20-3.0.5 +FROM bfren/nginx:nginx1.20-3.0.6 ARG BF_IMAGE ARG BF_VERSION From bcfd44b9dc46c8965400ad3adf3f6f05d6de75b6 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Fri, 18 Feb 2022 16:18:20 +0000 Subject: [PATCH 4/4] Removing bf-ch-apply --- overlay/usr/bin/bf/bf-ch-apply | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 overlay/usr/bin/bf/bf-ch-apply diff --git a/overlay/usr/bin/bf/bf-ch-apply b/overlay/usr/bin/bf/bf-ch-apply deleted file mode 100644 index 6881ed6..0000000 --- a/overlay/usr/bin/bf/bf-ch-apply +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -euo pipefail - - -#====================================================================================================================== -# Ensure file exists. -#====================================================================================================================== - -[[ -z "${1-}" ]] && bf-error "You must pass a file to apply." "bf-ch-apply" -FILE=${1} - -[[ ! -f "${FILE}" ]] && bf-error "${FILE} is not a file." "bf-ch-apply" - - -#====================================================================================================================== -# Apply ch file. -#====================================================================================================================== - -bf-echo "Applying ${FILE}..." "bf-ch-apply" - -while read GLOB OWNER FMODE DMODE ; do - - [[ -z "${GLOB-}" ]] && continue - - bf-ch -o ${OWNER} -r ${GLOB} - [[ -n "${FMODE}" ]] && bf-ch -m ${FMODE} -t f ${GLOB} - [[ -n "${DMODE}" ]] && bf-ch -m ${DMODE} -t d ${GLOB} - -done < "${FILE}" - -bf-debug "done." "bf-ch-apply"