From 5e42c65c03bb11cbb5f59c8c7d979bbb93244729 Mon Sep 17 00:00:00 2001 From: Ned Wright Date: Mon, 6 Feb 2023 16:44:20 +0000 Subject: [PATCH] Updating docker script --- attachments/nginx/ngx_module/nginx_version_configuration.sh | 1 + docker/Dockerfile | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/attachments/nginx/ngx_module/nginx_version_configuration.sh b/attachments/nginx/ngx_module/nginx_version_configuration.sh index 487a0bd..cd5bd8c 100755 --- a/attachments/nginx/ngx_module/nginx_version_configuration.sh +++ b/attachments/nginx/ngx_module/nginx_version_configuration.sh @@ -10,6 +10,7 @@ else exit 1 fi NGINX_VERSION_CONF_OUTPUT_PATH=/tmp/nginx.sourcefile.conf +dos2unix ${NGINX_VERSION_CONF_INPUT_PATH} $(dirname $0)/nginx_version_extractor.sh -i ${NGINX_VERSION_CONF_INPUT_PATH} -o ${NGINX_VERSION_CONF_OUTPUT_PATH} BUILD_OUTPUT_DIR=${3} diff --git a/docker/Dockerfile b/docker/Dockerfile index 0c58168..2dcd7d5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,11 @@ USER COPY lib/libosrc_compression_utils.so /usr/lib/libosrc_compression_utils.so COPY lib/libosrc_nginx_attachment_util.so /usr/lib/libosrc_nginx_attachment_util.so COPY lib/libosrc_shmem_ipc.so /usr/lib/libosrc_shmem_ipc.so +RUN mkdir -p /usr/lib/nginx/modules/ COPY lib/libngx_module.so /usr/lib/nginx/modules/ngx_cp_attachment_module.so RUN echo "load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;"|cat - /etc/nginx/nginx.conf> /tmp/out && mv /tmp/out /etc/nginx/nginx.conf RUN [ -f /etc/nginx/template/nginx.tmpl ] && echo "load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;"|cat - /etc/nginx/template/nginx.tmpl> /tmp/out.tmpl && mv /tmp/out.tmpl /etc/nginx/template/nginx.tmpl || echo "" +RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && /bin/sh -c sed -i "s|return \[\[|return \[\[\nload_module /usr/lib64/nginx/modules/ngx_cp_attachment_module.so;|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua +RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && /bin/sh -c sed -i "s|http {|http {\ncp_worker_processes \$\{\{nginx_worker_processes\}\};|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua +