Compare commits

..

7 Commits

Author SHA1 Message Date
garfieldwtf
158343aa16 Merge branch 'openresty:master' into master 2024-01-07 06:05:26 +08:00
Johnny Wang
8978f0426f formal release 1.25.3.1. (#952) 2024-01-04 11:43:38 +08:00
ruoyidero
a71e039a0d updated the default index page and 50x error page. (#949) 2024-01-04 10:57:01 +08:00
Johnny Wang
8760b0af4a win32: upgraded deps openssl to 1.1.1w and zlib to 1.3. (#950) 2023-12-31 10:02:42 +08:00
lijunlong
6fe9e3f7e6 feature: release openresty-1.25.3rc1.
Co-authored-by: jiahao <wangjiahao@openresty.com>
2023-12-29 16:14:01 +08:00
garfieldwtf
d315cade6f Update Dockerfile 2023-11-02 22:42:35 +08:00
garfieldwtf
f87345b52d Create Dockerfile 2023-11-01 19:12:10 +08:00
6 changed files with 522 additions and 457 deletions

45
Dockerfile Normal file
View File

@@ -0,0 +1,45 @@
#By GarfieldWTF
# Use an official Alpine Linux as the parent image
FROM alpine:latest
# Set environment variables for OpenResty and NGINX versions
ENV OPENRESTY_VERSION 1.21.4.2
ENV NGINX_VERSION 1.25.3
# Install required packages and build dependencies
RUN apk update && apk upgrade && apk add --no-cache \
build-base \
pcre-dev \
openssl-dev \
zlib-dev \
wget \
perl-dev \
libxslt-dev \
gd-dev \
geoip-dev
# Download and extract the source code for OpenResty and NGINX
RUN wget https://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz -O openresty.tar.gz \
&& wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -O nginx.tar.gz \
&& tar -xzvf openresty.tar.gz \
&& tar -xzvf nginx.tar.gz
# Build OpenResty and NGINX with OpenResty modules
RUN cd openresty-$OPENRESTY_VERSION \
&& ./configure --with-pcre-jit --with-ipv6 --with-http_ssl_module --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module --with-http_stub_status_module --with-http_auth_request_module --with-threads --with-stream --with-stream_ssl_module --with-mail --with-mail_ssl_module --with-cc-opt="-O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2" --with-ld-opt="-Wl,-z,relro -Wl,--as-needed" --prefix=/usr/local/openresty \
&& make \
&& make install
# Cleanup
RUN rm -rf openresty-$OPENRESTY_VERSION nginx-$NGINX_VERSION \
&& rm openresty.tar.gz nginx.tar.gz
# Add OpenResty to the system PATH
ENV PATH="/usr/local/openresty/bin:${PATH}"
# Expose ports if needed
EXPOSE 80
EXPOSE 443
# Optional: Set a default CMD to start OpenResty when the container runs
CMD ["nginx", "-g", "daemon off;"]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -1,13 +1,13 @@
#!/bin/bash
PCRE=pcre-8.45
ZLIB=zlib-1.2.13
OPENSSL=openssl-1.1.1t
ZLIB=zlib-1.3
OPENSSL=openssl-1.1.1w
JOBS=12
# wget https://www.openssl.org/source/openssl-1.1.1p.tar.gz
# wget http://zlib.net/zlib-1.2.12.tar.gz
# wget https://ftp.pcre.org/pub/pcre/pcre-8.44.tar.gz
# wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
# wget http://zlib.net/zlib-1.3.tar.gz
# wget https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz
rm -rf objs || exit 1
mkdir -p objs/lib || exit 1

View File

@@ -585,7 +585,7 @@ mv openresty-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
#################################
ver=0.36
ver=0.37
$root/util/get-tarball "https://github.com/openresty/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
mv openresty-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
@@ -599,7 +599,7 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.10.25
ver=0.10.26
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
@@ -613,7 +613,7 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
#################################
ver=0.0.13
ver=0.0.14
$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
@@ -627,7 +627,7 @@ mv openresty-array-var-nginx-module-* array-var-nginx-module-$ver || exit 1
#################################
ver=0.19
ver=0.20
$root/util/get-tarball "https://github.com/openresty/memc-nginx-module/tarball/v$ver" -O memc-nginx-module-$ver.tar.gz || exit 1
tar -xzf memc-nginx-module-$ver.tar.gz || exit 1
mv openresty-memc-nginx-module-* memc-nginx-module-$ver || exit 1
@@ -669,10 +669,30 @@ mv openresty-encrypted-session-nginx-module-* encrypted-session-nginx-module-$ve
#mv ngx_http_upstream_keepalive-* upstream-keepalive-nginx-module-$ver || exit 1
#################################
ver=0.4.0.1
$root/util/get-tarball "https://github.com/openresty/ngx_http_redis/tarball/v$ver" -O ngx_http_redis-$ver.tar.gz || exit 1
tar -xzf ngx_http_redis-$ver.tar.gz || exit 1
mv openresty-ngx_http_redis-* ngx_http_redis-$ver || exit 1
ver=0.3.9
$root/util/get-tarball "https://people.freebsd.org/~osa/ngx_http_redis-$ver.tar.gz" -O redis-nginx-module-$ver.tar.gz || exit 1
tar -xzf redis-nginx-module-$ver.tar.gz || exit 1
mv ngx_http_redis-* redis-nginx-module-$ver || exit 1
cd redis-nginx-module-$ver
echo "applying ngx_http_redis-$ver-variables_in_redis_pass.patch"
patch -p1 < $root/patches/ngx_http_redis-$ver-variables_in_redis_pass.patch || exit 1
echo
echo "applying ngx_http_redis-$ver-default_port_fix.patch"
patch -p1 < $root/patches/ngx_http_redis-$ver-default_port_fix.patch || exit 1
echo
answer=`$root/util/ver-ge "$main_ver" 1.23.0`
if [ "$answer" = "Y" ]; then
echo
echo "applying ngx_http_redis-$ver-remove_content_encoding.patch"
patch -p1 < $root/patches/ngx_http_redis-$ver-remove_content_encoding.patch || exit 1
echo
fi
cd ..
#################################
@@ -705,7 +725,7 @@ resty_cli=resty-cli-$ver
#################################
ver=0.0.7
ver=0.0.8
$root/util/get-tarball "https://github.com/openresty/opm/tarball/v$ver" -O opm-$ver.tar.gz || exit 1
tar -xzf opm-$ver.tar.gz || exit 1
mv openresty-opm-* opm-$ver || exit 1
@@ -777,7 +797,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
#################################
ver=0.26
ver=0.27
$root/util/get-tarball "https://github.com/openresty/lua-resty-mysql/tarball/v$ver" -O "lua-resty-mysql-$ver.tar.gz" || exit 1
tar -xzf lua-resty-mysql-$ver.tar.gz || exit 1
mv openresty-lua-resty-mysql-* lua-resty-mysql-$ver || exit 1
@@ -854,7 +874,7 @@ cd ..
#################################
ver=0.1.27
ver=0.1.28
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1