From cb21a779c158c2fc6981fe594cb4c1344ad73aa5 Mon Sep 17 00:00:00 2001 From: STAM Date: Sun, 18 Aug 2024 00:42:59 +0300 Subject: [PATCH] nginx 1.27.0 pre-final --- .../debian/12-bookworm/develop/Dockerfile | 40 ++++++------- linux/ecosystem/nginx/1.27.0/main/Dockerfile | 57 +++++++++++-------- 2 files changed, 54 insertions(+), 43 deletions(-) diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index 160e53c72..2116a6c8e 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -43,7 +43,7 @@ ENV PCRE_DIR=${EMG_LOCAL_BASE_DIR}/pcre2/${PCRE_VERSION} ENV PCRE_BIN_DIR=${PCRE_DIR}/bin ENV PCRE_LIB_DIR=${PCRE_DIR}/lib ENV PCRE_INC_DIR=${PCRE_DIR}/include -ENV PCRE_SRC_DIR=/usr/src/pcre2/${PCRE_VERSION} +ENV PCRE_SRC_DIR=/usr/local/src/pcre2/${PCRE_VERSION} ARG PCRE_DOWNLOAD_URL=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/pcre2-${PCRE_VERSION}.tar.gz ARG PCRE_TEMP=/tmp/pcre2-${PCRE_VERSION}.tar.gz ARG PCRE_TEMP_SRC=/tmp/pcre2-${PCRE_VERSION} @@ -54,7 +54,7 @@ ENV LUAJIT2OR_DIR=${EMG_LOCAL_BASE_DIR}/luajit2/${LUAJIT2OR_VERSION} ENV LUAJIT2OR_BIN_DIR=${PCRE_DIR}/bin ENV LUAJIT2OR_LIB_DIR=${LUAJIT2OR_DIR}/lib ENV LUAJIT2OR_INC_DIR=${LUAJIT2OR_DIR}/include -ENV LUAJIT2OR_SRC_DIR=/usr/src/luajit2/${LUAJIT2OR_VERSION} +ENV LUAJIT2OR_SRC_DIR=/usr/local/src/luajit2/${LUAJIT2OR_VERSION} ARG LUAJIT2OR_DOWNLOAD_URL=https://github.com/openresty/luajit2.git ARG LUAJIT2OR_TEMP_SRC=/tmp/luajit2 @@ -63,7 +63,7 @@ ENV ZLIB_VERSION=1.3.1 ENV ZLIB_DIR=${EMG_LOCAL_BASE_DIR}/zlib/${ZLIB_VERSION} ENV ZLIB_INC_DIR=${ZLIB_DIR}/include ENV ZLIB_LIB_DIR=${ZLIB_DIR}/lib -ENV ZLIB_SRC_DIR=/usr/src/zlib/${ZLIB_VERSION} +ENV ZLIB_SRC_DIR=/usr/local/src/zlib/${ZLIB_VERSION} ARG ZLIB_DOWNLOAD_URL=https://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP=/tmp/zlib-${ZLIB_VERSION}.tar.gz ARG ZLIB_TEMP_SRC=/tmp/zlib-${ZLIB_VERSION} @@ -74,7 +74,7 @@ ENV ZSTD_DIR=${EMG_LOCAL_BASE_DIR}/zstd/${ZLIB_VERSION} ENV ZSTD_BIN_DIR=${ZSTD_DIR}/bin ENV ZSTD_INC_DIR=${ZSTD_DIR}/include ENV ZSTD_LIB_DIR=${ZSTD_DIR}/lib -ENV ZSTD_SRC_DIR=/usr/src/zstd/${ZSTD_VERSION} +ENV ZSTD_SRC_DIR=/usr/local/src/zstd/${ZSTD_VERSION} ARG ZSTD_DOWNLOAD_URL=https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz ARG ZSTD_TEMP=/tmp/zstd-${ZSTD_VERSION}.tar.gz ARG ZSTD_TEMP_SRC=/tmp/zstd-${ZSTD_VERSION} @@ -85,7 +85,7 @@ ENV IP2LOC_DIR=${EMG_LOCAL_BASE_DIR}/ip2location/${IP2LOC_VERSION} ENV IP2LOC_BIN_DIR=${IP2LOC_DIR}/bin ENV IP2LOC_INC_DIR=${IP2LOC_DIR}/include ENV IP2LOC_LIB_DIR=${IP2LOC_DIR}/lib -ENV IP2LOC_SRC_DIR=/usr/src/ip2location/${IP2LOC_VERSION} +ENV IP2LOC_SRC_DIR=/usr/local/src/ip2location/${IP2LOC_VERSION} ARG IP2LOC_DOWNLOAD_URL=https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/heads/master.tar.gz ARG IP2LOC_TEMP=/tmp/master.tar.gz ARG IP2LOC_TEMP_SRC=/tmp/IP2Location-C-Library-master @@ -95,7 +95,7 @@ ENV LIBATOMICOPS_VERSION=7.8.2 ENV LIBATOMICOPS_DIR=${EMG_LOCAL_BASE_DIR}/libatomic_ops/${LIBATOMICOPS_VERSION} ENV LIBATOMICOPS_INC_DIR=${LIBATOMICOPS_DIR}/include ENV LIBATOMICOPS_LIB_DIR=${LIBATOMICOPS_DIR}/lib -ENV LIBATOMICOPS_SRC_DIR=/usr/src/libatomic_ops/${LIBATOMICOPS_VERSION} +ENV LIBATOMICOPS_SRC_DIR=/usr/local/src/libatomic_ops/${LIBATOMICOPS_VERSION} ARG LIBATOMICOPS_DOWNLOAD_URL=https://github.com/ivmai/libatomic_ops/releases/download/v${LIBATOMICOPS_VERSION}/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz ARG LIBATOMICOPS_TEMP=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION}.tar.gz ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} @@ -104,14 +104,14 @@ ARG LIBATOMICOPS_TEMP_SRC=/tmp/libatomic_ops-${LIBATOMICOPS_VERSION} ENV LIBIMAGEQUANT_VERSION=4.3.1 ARG LIBIMAGEQUANT_DOWNLOAD_URL=https://github.com/ImageOptim/libimagequant ENV LIBIMAGEQUANT_DIR=${EMG_LOCAL_BASE_DIR}/libimagequant -ENV LIBIMAGEQUANT_SRC_DIR=/usr/src/libimagequant/${LIBIMAGEQUANT_VERSION} +ENV LIBIMAGEQUANT_SRC_DIR=/usr/local/src/libimagequant/${LIBIMAGEQUANT_VERSION} ARG LIBIMAGEQUANT_TEMP_SRC=/tmp/libimagequant # libraqm source ENV LIBRAQM_VERSION=0.10.1 ARG LIBRAQM_DOWNLOAD_URL=https://github.com/HOST-Oman/libraqm ENV LIBRAQM_DIR=${EMG_LOCAL_BASE_DIR}/libraqm -ENV LIBRAQM_SRC_DIR=/usr/src/libraqm/${LIBRAQM_VERSION} +ENV LIBRAQM_SRC_DIR=/usr/local/src/libraqm/${LIBRAQM_VERSION} ARG LIBRAQM_TEMP_SRC=/tmp/libraqm # libgd source tarball @@ -120,7 +120,7 @@ ENV LIBGD_DIR=${EMG_LOCAL_BASE_DIR}/libgd/${LIBGD_VERSION} ENV LIBGD_BIN_DIR=${LIBGD_DIR}/bin ENV LIBGD_INC_DIR=${LIBGD_DIR}/include ENV LIBGD_LIB_DIR=${LIBGD_DIR}/lib -ENV LIBGD_SRC_DIR=/usr/src/libgd/${LIBGD_VERSION} +ENV LIBGD_SRC_DIR=/usr/local/src/libgd/${LIBGD_VERSION} ARG LIBGD_DOWNLOAD_URL=https://github.com/libgd/libgd/releases/download/gd-${LIBGD_VERSION}/libgd-${LIBGD_VERSION}.tar.gz ARG LIBGD_TEMP=/tmp/libgd-${LIBGD_VERSION}.tar.gz ARG LIBGD_TEMP_SRC=/tmp/libgd-${LIBGD_VERSION} @@ -131,7 +131,7 @@ ENV LIBXML2_DIR=${EMG_LOCAL_BASE_DIR}/libxml2/${LIBXML2_VERSION} ENV LIBXML2_BIN_DIR=${LIBXML2_DIR}/bin ENV LIBXML2_INC_DIR=${LIBXML2_DIR}/include ENV LIBXML2_LIB_DIR=${LIBXML2_DIR}/lib -ENV LIBXML2_SRC_DIR=/usr/src/libxml2/${LIBXML2_VERSION} +ENV LIBXML2_SRC_DIR=/usr/local/src/libxml2/${LIBXML2_VERSION} ARG LIBXML2_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz ARG LIBXML2_TEMP=/tmp/libxml2-v${LIBXML2_VERSION}.tar.gz ARG LIBXML2_TEMP_SRC=/tmp/libxml2-v${LIBXML2_VERSION} @@ -142,7 +142,7 @@ ENV LIBXSLT_DIR=${EMG_LOCAL_BASE_DIR}/libxslt/${LIBXSLT_VERSION} ENV LIBXSLT_BIN_DIR=${LIBXSLT_DIR}/bin ENV LIBXSLT_INC_DIR=${LIBXSLT_DIR}/include ENV LIBXSLT_LIB_DIR=${LIBXSLT_DIR}/lib -ENV LIBXSLT_SRC_DIR=/usr/src/libxslt/${LIBXSLT_VERSION} +ENV LIBXSLT_SRC_DIR=/usr/local/src/libxslt/${LIBXSLT_VERSION} ARG LIBXSLT_DOWNLOAD_URL=https://gitlab.gnome.org/GNOME/libxslt/-/archive/v${LIBXSLT_VERSION}/libxslt-v${LIBXSLT_VERSION}.tar.gz ARG LIBXSLT_TEMP=/tmp/libxslt-v${LIBXSLT_VERSION}.tar.gz ARG LIBXSLT_TEMP_SRC=/tmp/libxslt-v${LIBXSLT_VERSION} @@ -153,7 +153,7 @@ ENV MM_GEOIP_DIR=${EMG_LOCAL_BASE_DIR}/geoip/${MM_GEOIP_VERSION} ENV MM_GEOIP_BIN_DIR=${MM_GEOIP_DIR}/bin ENV MM_GEOIP_INC_DIR=${MM_GEOIP_DIR}/include ENV MM_GEOIP_LIB_DIR=${MM_GEOIP_DIR}/lib -ENV MM_GEOIP_SRC_DIR=/usr/src/geoip/${MM_GEOIP_VERSION} +ENV MM_GEOIP_SRC_DIR=/usr/local/src/geoip/${MM_GEOIP_VERSION} ARG MM_GEOIP_DOWNLOAD_URL=https://github.com/maxmind/geoip-api-c/releases/download/v${MM_GEOIP_VERSION}/GeoIP-${MM_GEOIP_VERSION}.tar.gz ARG MM_GEOIP_TEMP=/tmp/GeoIP-${MM_GEOIP_VERSION}.tar.gz ARG MM_GEOIP_TEMP_SRC=/tmp/GeoIP-${MM_GEOIP_VERSION} @@ -164,7 +164,7 @@ ENV GPERFTOOLS_DIR=${EMG_LOCAL_BASE_DIR}/gperftools/${GPERFTOOLS_VERSION} ENV GPERFTOOLS_BIN_DIR=${GPERFTOOLS_DIR}/bin ENV GPERFTOOLS_INC_DIR=${GPERFTOOLS_DIR}/include ENV GPERFTOOLS_LIB_DIR=${GPERFTOOLS_DIR}/lib -ENV GPERFTOOLS_SRC_DIR=/usr/src/gperftools/${GPERFTOOLS_VERSION} +ENV GPERFTOOLS_SRC_DIR=/usr/local/src/gperftools/${GPERFTOOLS_VERSION} ARG GPERFTOOLS_DOWNLOAD_URL=https://github.com/gperftools/gperftools/releases/download/gperftools-${GPERFTOOLS_VERSION}/gperftools-${GPERFTOOLS_VERSION}.tar.gz ARG GPERFTOOLS_TEMP=/tmp/gperftools-${GPERFTOOLS_VERSION}.tar.gz ARG GPERFTOOLS_TEMP_SRC=/tmp/gperftools-${GPERFTOOLS_VERSION} @@ -175,7 +175,7 @@ ENV OPENSSL_111_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_111_VERSION} ENV OPENSSL_111_BIN_DIR=${OPENSSL_111_DIR}/bin ENV OPENSSL_111_INC_DIR=${OPENSSL_111_DIR}/include ENV OPENSSL_111_LIB_DIR=${OPENSSL_111_DIR}/lib -ENV OPENSSL_111_SRC_DIR=/usr/src/openssl/${OPENSSL_111_VERSION} +ENV OPENSSL_111_SRC_DIR=/usr/local/src/openssl/${OPENSSL_111_VERSION} ARG OPENSSL_111_DOWNLOAD_URL=https://www.openssl.org/source/old/${OPENSSL_111_VERSION}/openssl-${OPENSSL_111_VERSION}w.tar.gz ARG OPENSSL_111_TEMP=/tmp/openssl-${OPENSSL_111_VERSION}w.tar.gz ARG OPENSSL_111_TEMP_SRC=/tmp/openssl-${OPENSSL_111_VERSION}w @@ -186,7 +186,7 @@ ENV OPENSSL_30_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_30_VERSION} ENV OPENSSL_30_BIN_DIR=${OPENSSL_30_DIR}/bin ENV OPENSSL_30_INC_DIR=${OPENSSL_30_DIR}/include ENV OPENSSL_30_LIB_DIR=${OPENSSL_30_DIR}/lib64 -ENV OPENSSL_30_SRC_DIR=/usr/src/openssl/${OPENSSL_30_VERSION} +ENV OPENSSL_30_SRC_DIR=/usr/local/src/openssl/${OPENSSL_30_VERSION} ARG OPENSSL_30_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_30_VERSION}.tar.gz ARG OPENSSL_30_TEMP=/tmp/openssl-${OPENSSL_30_VERSION}.tar.gz ARG OPENSSL_30_TEMP_SRC=/tmp/openssl-${OPENSSL_30_VERSION} @@ -197,7 +197,7 @@ ENV OPENSSL_31_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_31_VERSION} ENV OPENSSL_31_BIN_DIR=${OPENSSL_31_DIR}/bin ENV OPENSSL_31_INC_DIR=${OPENSSL_31_DIR}/include ENV OPENSSL_31_LIB_DIR=${OPENSSL_31_DIR}/lib64 -ENV OPENSSL_31_SRC_DIR=/usr/src/openssl/${OPENSSL_31_VERSION} +ENV OPENSSL_31_SRC_DIR=/usr/local/src/openssl/${OPENSSL_31_VERSION} ARG OPENSSL_31_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_31_VERSION}.tar.gz ARG OPENSSL_31_TEMP=/tmp/openssl-${OPENSSL_31_VERSION}.tar.gz ARG OPENSSL_31_TEMP_SRC=/tmp/openssl-${OPENSSL_31_VERSION} @@ -208,7 +208,7 @@ ENV OPENSSL_32_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_32_VERSION} ENV OPENSSL_32_BIN_DIR=${OPENSSL_32_DIR}/bin ENV OPENSSL_32_INC_DIR=${OPENSSL_32_DIR}/include ENV OPENSSL_32_LIB_DIR=${OPENSSL_32_DIR}/lib64 -ENV OPENSSL_32_SRC_DIR=/usr/src/openssl/${OPENSSL_32_VERSION} +ENV OPENSSL_32_SRC_DIR=/usr/local/src/openssl/${OPENSSL_32_VERSION} ARG OPENSSL_32_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_32_VERSION}.tar.gz ARG OPENSSL_32_TEMP=/tmp/openssl-${OPENSSL_32_VERSION}.tar.gz ARG OPENSSL_32_TEMP_SRC=/tmp/openssl-${OPENSSL_32_VERSION} @@ -219,7 +219,7 @@ ENV OPENSSL_33_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_33_VERSION} ENV OPENSSL_33_BIN_DIR=${OPENSSL_33_DIR}/bin ENV OPENSSL_33_INC_DIR=${OPENSSL_33_DIR}/include ENV OPENSSL_33_LIB_DIR=${OPENSSL_33_DIR}/lib64 -ENV OPENSSL_33_SRC_DIR=/usr/src/openssl/${OPENSSL_33_VERSION} +ENV OPENSSL_33_SRC_DIR=/usr/local/src/openssl/${OPENSSL_33_VERSION} ARG OPENSSL_33_DOWNLOAD_URL=https://www.openssl.org/source/openssl-${OPENSSL_33_VERSION}.tar.gz ARG OPENSSL_33_TEMP=/tmp/openssl-${OPENSSL_33_VERSION}.tar.gz ARG OPENSSL_33_TEMP_SRC=/tmp/openssl-${OPENSSL_33_VERSION} @@ -229,7 +229,7 @@ ENV LIBRESSL_VERSION=3.9.2 ENV LIBRESSL_DIR=${EMG_LOCAL_BASE_DIR}/libressl/${LIBRESSL_VERSION} ENV LIBRESSL_INC_DIR=${LIBRESSL_DIR}/include ENV LIBRESSL_LIB_DIR=${LIBRESSL_DIR}/lib -ENV LIBRESSL_SRC_DIR=/usr/src/libressl/${LIBRESSL_VERSION} +ENV LIBRESSL_SRC_DIR=/usr/local/src/libressl/${LIBRESSL_VERSION} ARG LIBRESSL_DOWNLOAD_URL=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz ARG LIBRESSL_TEMP=/tmp/libressl-${LIBRESSL_VERSION}.tar.gz ARG LIBRESSL_TEMP_SRC=/tmp/libressl-${LIBRESSL_VERSION} @@ -239,7 +239,7 @@ ENV BORINGSSL_VERSION=master ENV BORINGSSL_DIR=${EMG_LOCAL_BASE_DIR}/boringssl/${BORINGSSL_VERSION} ENV BORINGSSL_INC_DIR=${BORINGSSL_DIR}/include ENV BORINGSSL_LIB_DIR=${BORINGSSL_DIR}/lib -ENV BORINGSSL_SRC_DIR=/usr/src/boringssl/${BORINGSSL_VERSION} +ENV BORINGSSL_SRC_DIR=/usr/local/src/boringssl/${BORINGSSL_VERSION} ARG BORINGSSL_DOWNLOAD_URL=https://boringssl.googlesource.com/boringssl ARG BORINGSSL_TEMP_SRC=/tmp/boringssl diff --git a/linux/ecosystem/nginx/1.27.0/main/Dockerfile b/linux/ecosystem/nginx/1.27.0/main/Dockerfile index a30c36c6b..a9bc45a05 100644 --- a/linux/ecosystem/nginx/1.27.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.27.0/main/Dockerfile @@ -24,9 +24,9 @@ ENV NGINX_LOGS_DIR=/var/log/nginx ENV NGINX_LOCK_DIR=/var/lock/nginx ENV NGINX_LOCK=${NGINX_LOCK_DIR}/nginx.lock ENV NGINX_HTML_DIR=${NGINX_DIR}/html -ENV NGINX_PID_DIR=/var/run/nginx +ENV NGINX_PID_DIR=/run/nginx ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid -ENV NGINX_SRC_DIR=${NGINX_DIR}/src +ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz ARG NGINX_TEMP=/tmp/nginx-${NGINX_VERSION}.tar.gz ARG NGINX_TEMP_SRC=/tmp/nginx-${NGINX_VERSION} @@ -151,19 +151,26 @@ RUN tar -xf ${NGINX_TEMP} --directory /tmp && \ git clone https://github.com/yaoweibin/nginx_upstream_check_module modules/nginx-upstream-check-module RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ - cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/include/libxml2/libxml/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/google/* /usr/include && \ - cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/gperftools/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/include/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/include/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/luajit2/2.1/include/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/gperftools/2.15/include/* /usr/include && \ + cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/include/* /usr/include && \ cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/include/* /usr/include && \ cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/lib/* /usr/lib && \ cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib && \ cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib && \ cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib && \ cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib && \ cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib && \ + cp -rfv /usr/local/share/epicmorg/libxml2/2.13.2/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/libxslt/1.1.42/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/luajit2/2.1/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/libgd/2.3.3/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/libatomic_ops/7.8.2/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/gperftools/2.15/lib/* /usr/lib/x86_64-linux-gnu && \ + cp -rfv /usr/local/share/epicmorg/geoip/1.6.12/lib/* /usr/lib/x86_64-linux-gnu && \ ldconfig && \ ./configure \ --user=www-data \ @@ -183,14 +190,18 @@ RUN cp -rf ${NGINX_TEMP_SRC}/* ${NGINX_SRC_DIR} && \ --http-scgi-temp-path=${NGINX_CACHE_DIR}/scgi \ --http-uwsgi-temp-path=${NGINX_CACHE_DIR}/uwsgi \ --with-cc-opt="-I/usr/local/share/epicmorg/ip2location/8.7.0/include \ + -I/usr/local/share/epicmorg/libxml2/2.13.2/include \ + -I/usr/local/share/epicmorg/libxslt/1.1.42/include \ + -I/usr/local/share/epicmorg/luajit2/2.1/include \ + -I/usr/local/share/epicmorg/libgd/2.3.3/include \ + -I/usr/local/share/epicmorg/gperftools/2.15/include\ + -I/usr/local/share/epicmorg/geoip/1.6.12/include \ -I/usr/local/share/epicmorg/libxml2/2.13.2/include/libxml2/libxml \ -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libexslt \ -I/usr/local/share/epicmorg/libxslt/1.1.42/include/libxslt \ -I/usr/local/share/epicmorg/luajit2/2.1/include/luajit-2.1 \ - -I/usr/local/share/epicmorg/libgd/2.3.3/include \ -I/usr/local/share/epicmorg/gperftools/2.15/include/google \ -I/usr/local/share/epicmorg/gperftools/2.15/include/gperftools \ - -I/usr/local/share/epicmorg/geoip/1.6.12/include \ -static -g -O2 -lz -fPIC -Wdate-time -D_FORTIFY_SOURCE=2 -fstack-protector-strong \ -Wno-error=unused-but-set-variable -Wformat -Wno-error=date-time -Wno-error=implicit-fallthrough \ -Wno-error=cast-function-type -Wno-error=format-security -Wno-error=implicit-function-declaration \ @@ -330,26 +341,28 @@ ENV NGINX_LOGS_DIR=/var/log/nginx ENV NGINX_LOCK_DIR=/var/lock/nginx ENV NGINX_LOCK=${NGINX_LOCK_DIR}/nginx.lock ENV NGINX_HTML_DIR=${NGINX_DIR}/html -ENV NGINX_PID_DIR=/var/run/nginx +ENV NGINX_PID_DIR=/run/nginx ENV NGINX_PID=${NGINX_PID_DIR}/nginx.pid -ENV NGINX_SRC_DIR=${NGINX_DIR}/src +ENV NGINX_SRC_DIR=/usr/local/src/nginx/${NGINX_VERSION} ################################################################## # Copy compilled nginx from dev stage and prepare ################################################################## -COPY --from=build ${NGINX_CONF_DIR} ${NGINX_CONF_DIR} -COPY --from=build ${NGINX_DIR} ${NGINX_DIR} -COPY etc /etc - RUN mkdir -p \ ${NGINX_CONF_DIR}/sites-enabled \ ${NGINX_CONF_DIR}/modules-enabled \ ${NGINX_LOCK_DIR} \ ${NGINX_LOGS_DIR} \ ${NGINX_PID_DIR} \ - /var/www \ - && \ - mv ${NGINX_HTML_DIR} /var/www/ &\ + ${NGINX_SRC_DIR} \ + /var/www + +COPY --from=build ${NGINX_SRC_DIR} ${NGINX_SRC_DIR} +COPY --from=build ${NGINX_CONF_DIR} ${NGINX_CONF_DIR} +COPY --from=build ${NGINX_DIR} ${NGINX_DIR} +COPY etc /etc + +RUN mv ${NGINX_HTML_DIR} /var/www/ &\ ln -sfv /etc/ssl/dhparam.pem ${NGINX_CONF_DIR}/dhparam.pem && \ ln -sfv ${NGINX_MODULES_DIR} ${NGINX_DIR}/modules && \ ln -sfv ${NGINX_MODULES_PERL_DIR} ${NGINX_DIR}/modules-perl && \ @@ -359,7 +372,9 @@ RUN mkdir -p \ ln -sfv /dev/stderr /var/log/nginx/error.log && \ ln -sfv /var/lock/nginx ${NGINX_DIR}/lock && \ ln -sfv /var/run/nginx ${NGINX_DIR}/run && \ + ln -sfv /etc/nginx ${NGINX_DIR}/etc && \ ln -sfv /var/www/html ${NGINX_HTML_DIR} && \ + ln -sfv ${NGINX_SRC_DIR} ${NGINX_DIR}/src && \ ln -sfv ${NGINX_DIR} /usr/share/nginx ################################################################## @@ -400,7 +415,3 @@ RUN updatedb RUN nginx -V CMD ["nginx", "-g", "daemon off;"] - -#TODO: -# fix and redeploy develop (blocker!) -- DONE -# add link to /usr/src/nginx/ -> /src folder to final layer