diff --git a/docker/server/nginx.dockerfile b/docker/server/nginx.dockerfile index 92e21e1..f3066f2 100644 --- a/docker/server/nginx.dockerfile +++ b/docker/server/nginx.dockerfile @@ -1,9 +1,3 @@ RUN apk add nginx -ADD "docker/server/fastcgi.conf" /etc/nginx/fastcgi.conf -ADD "docker/server/nginx.conf" /etc/nginx/http.d/librex.conf - -RUN chmod u+x "/etc/nginx/fastcgi.conf" &&\ - chmod u+x "/etc/nginx/http.d/librex.conf" - CMD [ "/bin/sh", "-c", "docker/server/prepare.sh" ] diff --git a/docker/server/prepare.sh b/docker/server/prepare.sh index d6b2d3e..2120faf 100755 --- a/docker/server/prepare.sh +++ b/docker/server/prepare.sh @@ -14,4 +14,13 @@ export OPEN_SEARCH_HOST_FOR_NGINX="$(echo "${OPEN_SEARCH_HOST}" | cut -d "/" -f # The lines below will replace the environment variables in the templates with the corresponding variables listed above. To accomplish this, the GNU 'envsubst' package will be used # Although not recommended (if you do not know what you are doing), you still have the option to add new substitution file templates using any required environment variables -[[ ! -s ${CONFIG_NGINX_TEMPLATE} ]] && cat 'docker/server/nginx.conf' | envsubst '${OPEN_SEARCH_HOST_FOR_NGINX}' > ${CONFIG_NGINX_TEMPLATE}; +if [[ ! -s ${CONFIG_NGINX_TEMPLATE} ]]; then + cp "docker/server/fastcgi.conf" /etc/nginx/fastcgi.conf + cp "docker/server/nginx.conf" /etc/nginx/http.d/librex.conf + + # To address issues with 'nginx.conf', the following lines will ensure that these configurations remain executable + chmod u+x "/etc/nginx/fastcgi.conf" + chmod u+x "/etc/nginx/http.d/librex.conf" + + cat 'docker/server/nginx.conf' | envsubst '${OPEN_SEARCH_HOST_FOR_NGINX}' > ${CONFIG_NGINX_TEMPLATE}; +fi