Merge pull request #56 from devilbox/release-1.1

Mass vhost: Ignore dirs starting with a dot
devilbox · Jan 3, 2023 · c5cf2a2 · c5cf2a2
2 parents 68545d1 + d41610e
commit c5cf2a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfiles/Dockerfile.alpine b/Dockerfiles/Dockerfile.alpine
@@ -19,7 +19,7 @@ LABEL \
 ### Build arguments
 ###
 ARG VHOST_GEN_GIT_REF=1.0.10
-ARG WATCHERD_GIT_REF=v1.0.7
+ARG WATCHERD_GIT_REF=v1.1.0
 ARG CERT_GEN_GIT_REF=0.10
 ARG ARCH=linux/amd64
 

diff --git a/Dockerfiles/Dockerfile.debian b/Dockerfiles/Dockerfile.debian
@@ -13,7 +13,7 @@ LABEL \
 ### Build arguments
 ###
 ARG VHOST_GEN_GIT_REF=1.0.10
-ARG WATCHERD_GIT_REF=v1.0.7
+ARG WATCHERD_GIT_REF=v1.1.0
 ARG CERT_GEN_GIT_REF=0.10
 ARG ARCH=linux/amd64
 

diff --git a/Dockerfiles/data/docker-entrypoint.sh b/Dockerfiles/data/docker-entrypoint.sh
@@ -356,7 +356,7 @@ if [ "${MASS_VHOST_ENABLE}" -eq "1" ]; then
 
 	supervisord_create \
 		"${HTTPD_START}" \
-		"bash -c 'sleep ${WATCHERD_STARTUP_DELAY} && exec watcherd -c -v -p ${MASS_DOCROOT_BASE} -a \"${watcherd_add}\" -d \"${watcherd_del}\" -t \"${watcherd_tri}\"'" \
+		"bash -c 'sleep ${WATCHERD_STARTUP_DELAY} && exec watcherd -e \"^\\.\" -c -v -p ${MASS_DOCROOT_BASE} -a \"${watcherd_add}\" -d \"${watcherd_del}\" -t \"${watcherd_tri}\"'" \
 		"/etc/supervisord.conf"
 
 	log "done" "Starting supervisord: ${_SUPVD_VERSION} [HTTPD: ${_HTTPD_VERSION}]"