Merge pull request #2 from openappsec/kong-support

Kong support
This commit is contained in:
WrightNed 2023-02-15 17:35:37 +02:00 committed by GitHub
commit 5ec132440a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions

View File

@ -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}

View File

@ -300,6 +300,7 @@ addRequiredFlags()
BUILD_FLAG_PREFIX="--build="
OPENSSL_VERSION_PREFIX="--with-openssl="
OPENSSL_OPT_PREFIX="--with-openssl-opt="
PCRE_FOLDER_PREFIX="--with-pcre="
HPACK_ENC_PREFIX="--with-http_v2_hpack_enc"
AUTH_JWT_PREFIX="--with-http_auth_jwt_module"
F4F_PREFIX="--with-http_f4f_module"
@ -315,6 +316,7 @@ addRequiredFlags()
[[ ! ("${argv[i]}" =~ ${ADDITIONAL_MODULE_FLAG_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${OPENSSL_VERSION_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${OPENSSL_OPT_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${PCRE_FOLDER_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${DYNAMIC_MODULE_FLAG_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${BUILD_FLAG_PREFIX}) ]] && \
[[ ! ("${argv[i]}" =~ ${AUTH_JWT_PREFIX}) ]] && \

View File

@ -4,7 +4,6 @@ add_custom_command(
OUTPUT ${CMAKE_INSTALL_PREFIX}/nginx-docker.img
COMMAND docker build -t nginx-docker ${CMAKE_INSTALL_PREFIX}
COMMAND docker tag nginx-docker ${OUTPUT_DOCKER_IMAGE}
COMMAND docker push ${OUTPUT_DOCKER_IMAGE}
COMMAND docker image save nginx-docker -o ${CMAKE_INSTALL_PREFIX}/nginx-docker.img
)

View File

@ -6,13 +6,25 @@ RUN apk update
RUN apk add --no-cache -u busybox
RUN apk add --no-cache -u zlib
RUN apk add --no-cache libstdc++
RUN mkdir -p /usr/lib/nginx/modules/
RUN mkdir -p /usr/lib64/nginx/modules/
USER <DOCKER USER>
COPY lib/libosrc_compression_utils.so /usr/lib/libosrc_compression_utils.so
COPY lib/libosrc_compression_utils.so /usr/lib64/libosrc_compression_utils.so
COPY lib/libosrc_nginx_attachment_util.so /usr/lib/libosrc_nginx_attachment_util.so
COPY lib/libosrc_nginx_attachment_util.so /usr/lib64/libosrc_nginx_attachment_util.so
COPY lib/libosrc_shmem_ipc.so /usr/lib/libosrc_shmem_ipc.so
COPY lib/libosrc_shmem_ipc.so /usr/lib64/libosrc_shmem_ipc.so
COPY lib/libngx_module.so /usr/lib/nginx/modules/ngx_cp_attachment_module.so
COPY lib/libngx_module.so /usr/lib64/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 ""
USER root
RUN [ -f /etc/nginx/nginx.conf ] && sed -i 1i"load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;" /etc/nginx/nginx.conf || echo ""
RUN [ -f /etc/nginx/template/nginx.tmpl ] && sed -i 1i"load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;" /etc/nginx/template/nginx.tmpl || echo ""
RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && 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 || echo ""
RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i "s|http {|http {\ncp_worker_processes \$\{\{nginx_worker_processes\}\};|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo ""
USER <DOCKER USER>