diff --git a/hack/contrib/docker/gateway/Dockerfile b/hack/contrib/docker/gateway/Dockerfile index 45125b300..5bb0df577 100644 --- a/hack/contrib/docker/gateway/Dockerfile +++ b/hack/contrib/docker/gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM rainbond/openresty:1.15.8.2 +FROM rainbond/openresty:1.19.3.2 ARG RELEASE_DESC RUN apk add --no-cache bash net-tools curl tzdata && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ diff --git a/hack/contrib/docker/gateway/build-openresty/Dockerfile b/hack/contrib/docker/gateway/build-openresty/Dockerfile index 9c0cbce57..16a8edafa 100644 --- a/hack/contrib/docker/gateway/build-openresty/Dockerfile +++ b/hack/contrib/docker/gateway/build-openresty/Dockerfile @@ -2,7 +2,7 @@ # https://github.com/openresty/docker-openresty ARG RESTY_IMAGE_BASE="alpine" -ARG RESTY_IMAGE_TAG="3.11" +ARG RESTY_IMAGE_TAG="3.13" FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} @@ -10,10 +10,12 @@ LABEL maintainer="Evan Wies " # Docker Build Arguments ARG RESTY_IMAGE_BASE="alpine" -ARG RESTY_IMAGE_TAG="3.11" -ARG RESTY_VERSION="1.15.8.2" -ARG RESTY_OPENSSL_VERSION="1.1.1c" -ARG RESTY_PCRE_VERSION="8.43" +ARG RESTY_IMAGE_TAG="3.14" +ARG RESTY_VERSION="1.19.3.2" +ARG RESTY_OPENSSL_VERSION="1.1.1k" +ARG RESTY_OPENSSL_PATCH_VERSION="1.1.1f" +ARG RESTY_OPENSSL_URL_BASE="https://www.openssl.org/source" +ARG RESTY_PCRE_VERSION="8.44" ARG RESTY_J="1" ARG RESTY_CONFIG_OPTIONS="\ --with-compat \ @@ -64,6 +66,8 @@ LABEL resty_image_base="${RESTY_IMAGE_BASE}" LABEL resty_image_tag="${RESTY_IMAGE_TAG}" LABEL resty_version="${RESTY_VERSION}" LABEL resty_openssl_version="${RESTY_OPENSSL_VERSION}" +LABEL resty_openssl_patch_version="${RESTY_OPENSSL_PATCH_VERSION}" +LABEL resty_openssl_url_base="${RESTY_OPENSSL_URL_BASE}" LABEL resty_pcre_version="${RESTY_PCRE_VERSION}" LABEL resty_config_options="${RESTY_CONFIG_OPTIONS}" LABEL resty_config_options_more="${RESTY_CONFIG_OPTIONS_MORE}" @@ -97,17 +101,17 @@ RUN apk add --no-cache --virtual .build-deps \ && cd /tmp \ && if [ -n "${RESTY_EVAL_PRE_CONFIGURE}" ]; then eval $(echo ${RESTY_EVAL_PRE_CONFIGURE}); fi \ && cd /tmp \ - && curl -fSL https://www.openssl.org/source/openssl-${RESTY_OPENSSL_VERSION}.tar.gz -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \ + && curl -fSL "${RESTY_OPENSSL_URL_BASE}/openssl-${RESTY_OPENSSL_VERSION}.tar.gz" -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \ && tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \ && cd openssl-${RESTY_OPENSSL_VERSION} \ && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.1" ] ; then \ echo 'patching OpenSSL 1.1.1 for OpenResty' \ - && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-1.1.1c-sess_set_get_cb_yield.patch | patch -p1 ; \ + && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \ fi \ && if [ $(echo ${RESTY_OPENSSL_VERSION} | cut -c 1-5) = "1.1.0" ] ; then \ echo 'patching OpenSSL 1.1.0 for OpenResty' \ && curl -s https://raw.githubusercontent.com/openresty/openresty/ed328977028c3ec3033bc25873ee360056e247cd/patches/openssl-1.1.0j-parallel_build_fix.patch | patch -p1 \ - && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-1.1.0d-sess_set_get_cb_yield.patch | patch -p1 ; \ + && curl -s https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-${RESTY_OPENSSL_PATCH_VERSION}-sess_set_get_cb_yield.patch | patch -p1 ; \ fi \ && ./config \ no-threads shared zlib -g \ @@ -130,7 +134,7 @@ RUN apk add --no-cache --virtual .build-deps \ && make -j${RESTY_J} \ && make -j${RESTY_J} install \ && cd /tmp \ - && curl -fSL https://github.com/openresty/openresty/releases/download/v${RESTY_VERSION}/openresty-${RESTY_VERSION}.tar.gz -o openresty-${RESTY_VERSION}.tar.gz \ + && curl -fSL https://openresty.org/download/openresty-${RESTY_VERSION}.tar.gz -o openresty-${RESTY_VERSION}.tar.gz \ && tar xzf openresty-${RESTY_VERSION}.tar.gz \ && cd /tmp/openresty-${RESTY_VERSION} \ && eval ./configure -j${RESTY_J} ${_RESTY_CONFIG_DEPS} ${RESTY_CONFIG_OPTIONS} ${RESTY_CONFIG_OPTIONS_MORE} ${RESTY_LUAJIT_OPTIONS} \ @@ -150,6 +154,10 @@ RUN apk add --no-cache --virtual .build-deps \ # Add additional binaries into PATH for convenience ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin +# Copy nginx configuration files +#COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf +#COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf + CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"] # Use SIGQUIT instead of default SIGTERM to cleanly drain requests