mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 lijunlong
|
d0ada893fe |
+6
-3
@@ -113,14 +113,17 @@ env:
|
||||
- OPENSSL_INC=$OPENSSL_PREFIX/include
|
||||
- OPENRESTY_PREFIX=/opt/openresty
|
||||
jobs:
|
||||
- OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
- OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
env: OPENSSL_VER=1.1.0l OPENSSL_PATCH_VER=1.1.0d
|
||||
- <<: *linux-s390x
|
||||
env: OPENSSL_VER=1.1.1l OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
- <<: *linux-ppc64le
|
||||
env: OPENSSL_VER=1.1.1w OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
env: OPENSSL_VER=1.1.1s OPENSSL_PATCH_VER=1.1.1f ENABLE_HTTP3_OPTION=--with-http_v3_module
|
||||
|
||||
install:
|
||||
- cpanm --sudo --notest Test::Nginx IPC::Run3 > build.log 2>&1 || (cat build.log && exit 1)
|
||||
|
||||
-45
@@ -1,45 +0,0 @@
|
||||
#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;"]
|
||||
+15
-15
File diff suppressed because one or more lines are too long
+15
-15
File diff suppressed because one or more lines are too long
+1284
-1461
File diff suppressed because it is too large
Load Diff
+5
-5
@@ -1,13 +1,13 @@
|
||||
#!/bin/bash
|
||||
|
||||
PCRE=pcre-8.45
|
||||
ZLIB=zlib-1.3
|
||||
OPENSSL=openssl-1.1.1w
|
||||
ZLIB=zlib-1.2.13
|
||||
OPENSSL=openssl-1.1.1t
|
||||
JOBS=12
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
||||
rm -rf objs || exit 1
|
||||
mkdir -p objs/lib || exit 1
|
||||
|
||||
Vendored
+14
-18
@@ -554,6 +554,9 @@ _END_
|
||||
"\n";
|
||||
}
|
||||
|
||||
# disable pcre2 by default
|
||||
push @ngx_opts, '--without-pcre2';
|
||||
|
||||
if (!$opts->{no_stream}
|
||||
&& ! $opts->{no_stream_ssl}
|
||||
&& ! $opts->{stream_ssl})
|
||||
@@ -776,8 +779,8 @@ _END_
|
||||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL_X='\$(INSTALL) -m 0755' " .
|
||||
"INSTALL_F='\$(INSTALL) -m 0644'";
|
||||
$extra_opts .= " INSTALL_X='$root_dir/build/install -m 0755' " .
|
||||
"INSTALL_F='$root_dir/build/install -m 0644'";
|
||||
}
|
||||
|
||||
if (defined $cc) {
|
||||
@@ -950,7 +953,7 @@ _EOC_
|
||||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
#$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
#$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .=
|
||||
" CJSON_CFLAGS=\"-g -O -fpic -DUSE_INTERNAL_ISINF\"";
|
||||
@@ -994,7 +997,7 @@ _EOC_
|
||||
"LUA_LIB_DIR=$lualib_prefix";
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
}
|
||||
|
||||
if ($opts->{debug}) {
|
||||
@@ -1047,7 +1050,7 @@ _EOC_
|
||||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O -Wall\"";
|
||||
}
|
||||
@@ -1098,7 +1101,7 @@ _EOC_
|
||||
}
|
||||
|
||||
if ($on_solaris) {
|
||||
$extra_opts .= " INSTALL='\$(INSTALL)'";
|
||||
$extra_opts .= " INSTALL=$root_dir/build/install";
|
||||
if ($opts->{debug}) {
|
||||
$extra_opts .= " CFLAGS=\"-g -O -Wall\"";
|
||||
|
||||
@@ -1146,10 +1149,8 @@ _EOC_
|
||||
} else {
|
||||
$target_dir = "\$(DESTDIR)$prefix/bin/";
|
||||
}
|
||||
push @make_install_cmds,
|
||||
"mkdir '$target_dir'",
|
||||
"cd $root_dir/build/$opm_dir && "
|
||||
. "\$(INSTALL) bin/* '$target_dir'";
|
||||
push @make_install_cmds, "cd $root_dir/build/$opm_dir && "
|
||||
. "$root_dir/build/install bin/* $target_dir";
|
||||
}
|
||||
|
||||
# configure resty-cli:
|
||||
@@ -1163,7 +1164,7 @@ _EOC_
|
||||
$target_dir = "\$(DESTDIR)$prefix/bin/";
|
||||
}
|
||||
push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
|
||||
. "\$(INSTALL) bin/* $target_dir";
|
||||
. "$root_dir/build/install bin/* $target_dir";
|
||||
|
||||
if ($platform ne 'msys') {
|
||||
# patch the resty script:
|
||||
@@ -1246,7 +1247,7 @@ sub add_lua_lib ($$$) {
|
||||
|
||||
my $extra_opts =
|
||||
" DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
|
||||
." INSTALL='\$(INSTALL)'";
|
||||
." INSTALL=$root_dir/build/install";
|
||||
|
||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
@@ -1559,12 +1560,7 @@ sub gen_makefile {
|
||||
print $out "DESTDIR ?= $root_dir/\n\n";
|
||||
}
|
||||
|
||||
print $out <<_EOC_;
|
||||
INSTALL := $root_dir/build/install
|
||||
|
||||
.PHONY: all install clean
|
||||
|
||||
_EOC_
|
||||
print $out ".PHONY: all install clean\n\n";
|
||||
|
||||
print $out "all:\n\t" . join("\n\t", @make_cmds) . "\n\n";
|
||||
|
||||
|
||||
+11
-31
@@ -585,7 +585,7 @@ mv openresty-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.37
|
||||
ver=0.36
|
||||
$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.26
|
||||
ver=0.10.25
|
||||
$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.14
|
||||
ver=0.0.13
|
||||
$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.20
|
||||
ver=0.19
|
||||
$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,30 +669,10 @@ 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.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 ..
|
||||
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
|
||||
|
||||
#################################
|
||||
|
||||
@@ -725,7 +705,7 @@ resty_cli=resty-cli-$ver
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.0.8
|
||||
ver=0.0.7
|
||||
$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
|
||||
@@ -797,7 +777,7 @@ mv openresty-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.27
|
||||
ver=0.26
|
||||
$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
|
||||
@@ -874,7 +854,7 @@ cd ..
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.1.28
|
||||
ver=0.1.27
|
||||
$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
|
||||
|
||||
Reference in New Issue
Block a user