Skip to content

Commit

Permalink
Upgrade openresty to 1.19.3.2 (#27)
Browse files Browse the repository at this point in the history
Signed-off-by: clyang82 <[email protected]>
  • Loading branch information
clyang82 authored Aug 20, 2021
1 parent d7fad3b commit ce9dedf
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM registry.access.redhat.com/ubi7/ubi:7.9 AS openresty_base

# Docker Build Arguments
ARG PREFIX_DIR="/opt/ibm/router"
ARG RESTY_VERSION="1.19.3.1"
ARG RESTY_VERSION="1.19.3.2"
ARG ROLLBACK_RESTY_VERSION="1.17.8.2"
ARG RESTY_OPENSSL_VERSION="1.1.1j"
ARG RESTY_PCRE_VERSION="8.42"
Expand Down Expand Up @@ -113,7 +113,7 @@ RUN if [[ "$(uname -m)" != "s390x" ]]; then \
export _RESTY_CONFIG_DEPS="--with-luajit --with-openssl=/tmp/openssl-${RESTY_OPENSSL_VERSION} --with-pcre=/tmp/pcre-${RESTY_PCRE_VERSION}" \
&& cd /tmp/openresty-${RESTY_VERSION} \
&& sed -ire "s/openresty/server/g" `find ./ -name ngx_http_special_response.c` \
# next two lines fix two compilation errors with OpenResty 1.19.3.1
# next two lines fix two compilation errors with OpenResty 1.19.3.2
&& sed -ire '1i #include "lualib.h"' `find ./ -name lj_ccallback.c` \
&& sed -ire "s/for .int /int i; for (/g" `find ./ -name lib_jit.c` \
&& ./configure -j${RESTY_J} ${_RESTY_CONFIG_DEPS} ${RESTY_CONFIG_OPTIONS} ${RESTY_CONFIG_OPTIONS_MORE} \
Expand Down
2 changes: 1 addition & 1 deletion build/Configfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IMAGE_NAME = management-ingress
IMAGE_DESCRIPTION = management-ingress image
IMAGE_VENDOR=Red Hat
IMAGE_SUMMARY=$(IMAGE_DESCRIPTION)
OPENRESTY_VERSION ?= 1.19.3.1
OPENRESTY_VERSION ?= 1.19.3.2
RELEASE_TAG ?= $(SEMVERSION)
DOCKER_REGISTRY ?= quay.io
DOCKER_NAMESPACE ?= open-cluster-management
Expand Down
Binary file removed external-deps/openresty-1.19.3.1.tar.gz
Binary file not shown.
Binary file added external-deps/openresty-1.19.3.2.tar.gz
Binary file not shown.

0 comments on commit ce9dedf

Please sign in to comment.