diff --git a/Dockerfile b/Dockerfile index cdb61ac..11c44bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ -ARG RESTY_BASE_IMAGE_TAG="3.22.3" +ARG RESTY_BASE_IMAGE_TAG="3.23.4" FROM alpine:${RESTY_BASE_IMAGE_TAG} ARG RESTY_BASE_IMAGE_TAG # Docker Build Arguments -ARG RESTY_VERSION="1.27.1.2" +ARG RESTY_VERSION="1.29.2.4" # https://github.com/openresty/openresty-packaging/blob/master/alpine/openresty-openssl3/APKBUILD -ARG RESTY_OPENSSL_VERSION="3.4.3" -ARG RESTY_OPENSSL_PATCH_VERSION="3.4.1" +ARG RESTY_OPENSSL_VERSION="3.5.6" +ARG RESTY_OPENSSL_PATCH_VERSION="3.5.5" ARG RESTY_OPENSSL_URL_BASE="https://github.com/openssl/openssl/releases/download/openssl-${RESTY_OPENSSL_VERSION}" ARG RESTY_OPENSSL_BUILD_OPTIONS="enable-camellia enable-rfc3779 enable-ktls enable-fips \ disable-md2 disable-rc5 disable-weak-ssl-ciphers disable-ssl3 disable-ssl3-method" # https://github.com/openresty/openresty-packaging/blob/master/alpine/openresty-pcre2/APKBUILD -ARG RESTY_PCRE_VERSION="10.44" -ARG RESTY_PCRE_SHA256="86b9cb0aa3bcb7994faa88018292bc704cdbb708e785f7c74352ff6ea7d3175b" +ARG RESTY_PCRE_VERSION="10.47" +ARG RESTY_PCRE_SHA256="c08ae2388ef333e8403e670ad70c0a11f1eed021fd88308d7e02f596fcd9dc16" ARG RESTY_PCRE_BUILD_OPTIONS="--enable-jit --enable-pcre2grep-jit --disable-bsr-anycrlf --disable-coverage --disable-ebcdic --disable-fuzz-support \ --disable-jit-sealloc --disable-never-backslash-C --enable-newline-is-lf --enable-pcre2-8 --enable-pcre2-16 --enable-pcre2-32 \ --enable-pcre2grep-callout --enable-pcre2grep-callout-fork --disable-pcre2grep-libbz2 --disable-pcre2grep-libz --disable-pcre2test-libedit \ @@ -71,7 +71,6 @@ LABEL resty.version="${RESTY_VERSION}" \ resty.openssl_version="${RESTY_OPENSSL_VERSION}" \ resty.openssl_patch_version="${RESTY_OPENSSL_PATCH_VERSION}" \ resty.pcre_version="${RESTY_PCRE_VERSION}" \ - resty.pcre_sha256="${RESTY_PCRE_SHA256}" \ resty.geoip2_version="${RESTY_GEOIP2_VERSION}" \ resty.config_options="${RESTY_CONFIG_OPTIONS}" @@ -85,6 +84,8 @@ RUN set -x && apk update && apk add --no-cache --virtual .build-deps \ binutils \ coreutils \ curl \ + git \ + bash \ gd-dev \ libmaxminddb-dev \ linux-headers \ @@ -99,6 +100,13 @@ RUN set -x && apk update && apk add --no-cache --virtual .build-deps \ tzdata \ zlib \ && cd /tmp \ + && git clone --depth 1 https://github.com/openresty/openresty.git src \ + && cd src \ + && git switch --detach v${RESTY_VERSION} \ + && make \ + && mv openresty-*.tar.gz "/tmp/openresty-${RESTY_VERSION}.tar.gz" \ + && rm -rf /tmp/src/ \ + && cd /tmp \ && 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} \ @@ -138,7 +146,6 @@ RUN set -x && apk update && apk add --no-cache --virtual .build-deps \ && curl -sfSL https://github.com/leev/ngx_http_geoip2_module/archive/${RESTY_GEOIP2_VERSION}.tar.gz -o ngx_http_geoip2_module-${RESTY_GEOIP2_VERSION}.tar.gz \ && tar xzf ngx_http_geoip2_module-${RESTY_GEOIP2_VERSION}.tar.gz \ && cd /tmp \ - && 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} ${RESTY_PCRE_OPTIONS} \