@@ -23,6 +23,7 @@ ENV HASHTOPOLIS_FILES_PATH=${HASHTOPOLIS_PATH}/files
23
23
ENV HASHTOPOLIS_IMPORT_PATH=${HASHTOPOLIS_PATH}/import
24
24
ENV HASHTOPOLIS_LOG_PATH=${HASHTOPOLIS_PATH}/log
25
25
ENV HASHTOPOLIS_CONFIG_PATH=${HASHTOPOLIS_PATH}/config
26
+ ENV HASHTOPOLIS_BINARIES_PATH=${HASHTOPOLIS_PATH}/binaries
26
27
27
28
# Add support for TLS inspection corporate setups, see .env.sample for details
28
29
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt
@@ -66,7 +67,10 @@ RUN mkdir -p ${HASHTOPOLIS_DOCUMENT_ROOT} \
66
67
&& chmod g+w ${HASHTOPOLIS_LOG_PATH} \
67
68
&& mkdir -p ${HASHTOPOLIS_CONFIG_PATH} \
68
69
&& chown www-data:www-data ${HASHTOPOLIS_CONFIG_PATH} \
69
- && chmod g+w ${HASHTOPOLIS_CONFIG_PATH}
70
+ && chmod g+w ${HASHTOPOLIS_CONFIG_PATH} \
71
+ && mkdir -p ${HASHTOPOLIS_BINARIES_PATH} \
72
+ && chown www-data:www-data ${HASHTOPOLIS_BINARIES_PATH} \
73
+ && chmod g+w ${HASHTOPOLIS_BINARIES_PATH}
70
74
71
75
COPY --from=preprocess /HEA[D] ${HASHTOPOLIS_DOCUMENT_ROOT}/../.git/
72
76
@@ -78,7 +82,7 @@ COPY docker-entrypoint.sh /usr/local/bin
78
82
79
83
# Setting the hashtopolis document root is done at build time. Because the www-data user cannot write to the apache config folder.
80
84
COPY 000-default.conf /tmp/
81
- RUN envsubst '${HASHTOPOLIS_DOCUMENT_ROOT}' < /tmp/000-default.conf > /etc/apache2/sites-available/000-default.conf && rm /tmp/000-default.conf
85
+ RUN envsubst '${HASHTOPOLIS_DOCUMENT_ROOT} ${HASHTOPOLIS_BINARIES_PATH} ' < /tmp/000-default.conf > /etc/apache2/sites-available/000-default.conf && rm /tmp/000-default.conf
82
86
83
87
ENTRYPOINT [ "docker-entrypoint.sh" ]
84
88
# ----END----
0 commit comments