Skip to content

Commit ed3382c

Browse files
authored
Merge pull request #58 from devilbox/release-1.1
Mass vhost: Ignore dirs starting with a dot
2 parents 4d73a99 + 75044b3 commit ed3382c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfiles/Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL \
1313
### Build arguments
1414
###
1515
ARG VHOST_GEN_GIT_REF=1.0.10
16-
ARG WATCHERD_GIT_REF=v1.0.7
16+
ARG WATCHERD_GIT_REF=v1.1.0
1717
ARG CERT_GEN_GIT_REF=0.10
1818

1919
ENV BUILD_DEPS \

Dockerfiles/Dockerfile.debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL \
1313
### Build arguments
1414
###
1515
ARG VHOST_GEN_GIT_REF=1.0.10
16-
ARG WATCHERD_GIT_REF=v1.0.7
16+
ARG WATCHERD_GIT_REF=v1.1.0
1717
ARG CERT_GEN_GIT_REF=0.10
1818

1919
ENV BUILD_DEPS \

Dockerfiles/data/docker-entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ if [ "${MASS_VHOST_ENABLE}" -eq "1" ]; then
356356

357357
supervisord_create \
358358
"${HTTPD_START}" \
359-
"bash -c 'sleep ${WATCHERD_STARTUP_DELAY} && exec watcherd -c -v -p ${MASS_DOCROOT_BASE} -a \"${watcherd_add}\" -d \"${watcherd_del}\" -t \"${watcherd_tri}\"'" \
359+
"bash -c 'sleep ${WATCHERD_STARTUP_DELAY} && exec watcherd -e \"^\\.\" -c -v -p ${MASS_DOCROOT_BASE} -a \"${watcherd_add}\" -d \"${watcherd_del}\" -t \"${watcherd_tri}\"'" \
360360
"/etc/supervisord.conf"
361361

362362
log "done" "Starting supervisord: ${_SUPVD_VERSION} [HTTPD: ${_HTTPD_VERSION}]"

0 commit comments

Comments
 (0)