From 7108a092c4160e38ed299bd0f24f2596343e98b8 Mon Sep 17 00:00:00 2001 From: sucongohu <1126045770@qq.com> Date: Thu, 1 Feb 2024 13:55:46 +0800 Subject: [PATCH] save --- nginx-google/Dockerfile | 2 +- nginx/Dockerfile | 2 +- nginx/Dockerfile-arm32v7 | 2 +- nginx/Dockerfile-arm64v8 | 2 +- nginx/Dockerfile-debug | 2 +- nginx/Dockerfile-flv | 8 ++++---- nginx/Dockerfile-http3 | 2 +- nginx/Dockerfile-rtmp | 2 +- nginx/Dockerfile-stream | 2 +- nginx/README.MD | 2 +- nginx/make.sh | 2 +- openresty/Dockerfile | 2 +- openresty/make.sh | 2 +- php/81/Dockerfile-swoole | 2 +- php/81/make-swoole.sh | 2 +- php/82/Dockerfile | 2 +- php/82/Dockerfile-mongo | 2 +- php/82/Dockerfile-redis | 2 +- php/82/Dockerfile-swoole | 4 ++-- php/82/make-redis.sh | 2 +- php/82/make-swoole.sh | 2 +- php/82/make.sh | 2 +- php/Dockerfile | 2 +- php/Dockerfile-mongo | 2 +- php/Dockerfile-redis | 2 +- php/Dockerfile-swoole | 4 ++-- php/make-redis.sh | 2 +- php/make-swoole.sh | 2 +- php/make.sh | 2 +- 29 files changed, 34 insertions(+), 34 deletions(-) diff --git a/nginx-google/Dockerfile b/nginx-google/Dockerfile index ed2f5be..fbbd02f 100644 --- a/nginx-google/Dockerfile +++ b/nginx-google/Dockerfile @@ -2,7 +2,7 @@ FROM alpine AS build RUN apk add --update gcc g++ make wget git file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static RUN git clone https://github.com/cuber/ngx_http_google_filter_module RUN git clone https://github.com/yaoweibin/ngx_http_substitutions_filter_module -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && ls -lha && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && ls -lha && \ ./configure --with-http_v2_module --with-http_ssl_module --with-stream --with-stream_ssl_preread_module --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock \ --without-select_module \ --without-poll_module \ diff --git a/nginx/Dockerfile b/nginx/Dockerfile index b347758..839ee30 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,6 @@ FROM alpine AS build RUN apk --update add gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-file-aio --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/Dockerfile-arm32v7 b/nginx/Dockerfile-arm32v7 index 292aac1..332e13c 100644 --- a/nginx/Dockerfile-arm32v7 +++ b/nginx/Dockerfile-arm32v7 @@ -1,6 +1,6 @@ FROM arm32v7/alpine AS build RUN apk add --update gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/Dockerfile-arm64v8 b/nginx/Dockerfile-arm64v8 index 0e19089..97d36b5 100644 --- a/nginx/Dockerfile-arm64v8 +++ b/nginx/Dockerfile-arm64v8 @@ -1,6 +1,6 @@ FROM arm64v8/alpine AS build RUN apk add --update gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/Dockerfile-debug b/nginx/Dockerfile-debug index 07ac0c8..f41ea3a 100644 --- a/nginx/Dockerfile-debug +++ b/nginx/Dockerfile-debug @@ -1,6 +1,6 @@ FROM alpine AS build RUN apk add --update gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --with-debug --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-Os LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/Dockerfile-flv b/nginx/Dockerfile-flv index 08de63c..230c451 100644 --- a/nginx/Dockerfile-flv +++ b/nginx/Dockerfile-flv @@ -1,10 +1,10 @@ FROM alpine AS build RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN apk add --update gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ -wget -O- https://github.com/winshining/nginx-http-flv-module/archive/v1.2.10.tar.gz | tar xz && \ -wget -O- https://github.com/kaltura/nginx-vod-module/archive/1.31.tar.gz | tar xz && \ -./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --with-http_flv_module --with-http_mp4_module --add-module=nginx-http-flv-module-1.2.10 --add-module=nginx-vod-module-1.30 --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +wget -O- https://github.com/winshining/nginx-http-flv-module/archive/v1.2.11.tar.gz | tar xz && \ +wget -O- https://github.com/kaltura/nginx-vod-module/archive/1.32.tar.gz | tar xz && \ +./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --with-http_flv_module --with-http_mp4_module --add-module=nginx-http-flv-module-1.2.11 --add-module=nginx-vod-module-1.32 --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/Dockerfile-http3 b/nginx/Dockerfile-http3 index f358980..ddeae40 100644 --- a/nginx/Dockerfile-http3 +++ b/nginx/Dockerfile-http3 @@ -1,6 +1,6 @@ FROM alpine:edge AS build RUN apk --update add gcc g++ make cmake wget file git cargo rust patch pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ git clone --depth=1 --recursive --shallow-submodules https://github.com/google/ngx_brotli && \ git clone --depth=1 --recursive --shallow-submodules https://github.com/openresty/headers-more-nginx-module && \ NJS_TAG=0.8.1 && git clone --branch $NJS_TAG --depth=1 --recursive --shallow-submodules https://github.com/nginx/njs && \ diff --git a/nginx/Dockerfile-rtmp b/nginx/Dockerfile-rtmp index 1c7ede8..9b5561d 100644 --- a/nginx/Dockerfile-rtmp +++ b/nginx/Dockerfile-rtmp @@ -1,7 +1,7 @@ FROM alpine AS build RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN apk --update add gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ wget -O- https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v1.2.2.tar.gz | tar xz && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-file-aio --add-module=nginx-rtmp-module-1.2.2 --with-debug --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ diff --git a/nginx/Dockerfile-stream b/nginx/Dockerfile-stream index 0bd7d5b..f6eb0c0 100644 --- a/nginx/Dockerfile-stream +++ b/nginx/Dockerfile-stream @@ -1,7 +1,7 @@ FROM alpine AS build RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN apk add --update gcc g++ make wget file openssl-dev openssl-libs-static pcre-dev zlib-dev zlib-static linux-headers -RUN NGINX_VERSION=nginx-1.25.1 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ +RUN NGINX_VERSION=nginx-1.25.3 && wget http://nginx.org/download/${NGINX_VERSION}.tar.gz && tar zxf ${NGINX_VERSION}.tar.gz && cd ${NGINX_VERSION} && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_ssl_module --with-http_slice_module --with-stream --with-stream_ssl_preread_module --with-file-aio --sbin-path=/usr/local/sbin/nginx --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock && \ sed -i "s/-lpcre -lssl -lcrypto -lz/-static -lpcre -lssl -lcrypto -lz/g" objs/Makefile && make -j2 CFLAGS=-O3 LDFLAGS=-static && make install && \ strip -s /usr/local/sbin/nginx && rm -rf /etc/nginx/*.default diff --git a/nginx/README.MD b/nginx/README.MD index fa2e499..47256bc 100644 --- a/nginx/README.MD +++ b/nginx/README.MD @@ -2,7 +2,7 @@ static build nginx -nginx version 1.25.1 +nginx version 1.25.3 ## Usage diff --git a/nginx/make.sh b/nginx/make.sh index 3018b12..72d8856 100755 --- a/nginx/make.sh +++ b/nginx/make.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker build -t=suconghou/nginx -t=suconghou/nginx:1.25.1 -t=suconghou/nginx:alpine . && \ +docker build -t=suconghou/nginx -t=suconghou/nginx:1.25.3 -t=suconghou/nginx:alpine . && \ docker build -t=suconghou/nginx:busybox . -f Dockerfile-busybox diff --git a/openresty/Dockerfile b/openresty/Dockerfile index 9ff5973..dca6d2c 100644 --- a/openresty/Dockerfile +++ b/openresty/Dockerfile @@ -1,7 +1,7 @@ FROM alpine AS build RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN apk add --update gcc g++ make wget perl pcre-dev openssl-dev openssl-libs-static zlib-dev zlib-static -RUN OPENRESTY_VERSION=openresty-1.21.4.1 && wget https://openresty.org/download/${OPENRESTY_VERSION}.tar.gz && tar xzf ${OPENRESTY_VERSION}.tar.gz && cd ${OPENRESTY_VERSION} && \ +RUN OPENRESTY_VERSION=openresty-1.25.3.1 && wget https://openresty.org/download/${OPENRESTY_VERSION}.tar.gz && tar xzf ${OPENRESTY_VERSION}.tar.gz && cd ${OPENRESTY_VERSION} && \ rm -f /lib/libcrypto.so* /lib/libssl.so* /usr/lib/libpcre.so* && \ ./configure --with-pcre --with-pcre-jit --with-http_v2_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_addition_module --with-http_realip_module -j4 && \ make -j4 && make install && strip -s /usr/local/openresty/nginx/sbin/nginx /usr/lib/libgcc_s.so.1 /usr/local/openresty/luajit/lib/libluajit-5.1.so.2.1.0 && \ diff --git a/openresty/make.sh b/openresty/make.sh index b9be714..f708e7f 100755 --- a/openresty/make.sh +++ b/openresty/make.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/openresty -t=suconghou/openresty:1.21.4.1 . +docker build -t=suconghou/openresty -t=suconghou/openresty:1.25.3.1 . diff --git a/php/81/Dockerfile-swoole b/php/81/Dockerfile-swoole index 635513b..cbad51c 100644 --- a/php/81/Dockerfile-swoole +++ b/php/81/Dockerfile-swoole @@ -12,7 +12,7 @@ RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/g RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary RUN IMAGICK_VERSION=imagick-3.7.0 && cd php-8.*.* && wget https://pecl.php.net/get/${IMAGICK_VERSION}.tgz && tar zxf ${IMAGICK_VERSION}.tgz && mv ${IMAGICK_VERSION} ext/imagick RUN APCU_VERSION=apcu-5.1.23 && cd php-8.*.* && wget https://pecl.php.net/get/${APCU_VERSION}.tgz && tar zxf ${APCU_VERSION}.tgz && mv ${APCU_VERSION} ext/apcu -RUN SWOOLE_VERSION=swoole-5.1.1 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole +RUN SWOOLE_VERSION=swoole-5.1.2 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole RUN cd php-8.*.* && rm -rf configure && ./buildconf --force && \ export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && \ export LIBZIP_LIBS="-L/usr/local/lib64 -lzip" && \ diff --git a/php/81/make-swoole.sh b/php/81/make-swoole.sh index bfd8102..1d72584 100755 --- a/php/81/make-swoole.sh +++ b/php/81/make-swoole.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:8.1.27_swoole_5.1.1 . -f Dockerfile-swoole +docker build -t=suconghou/php:8.1.27_swoole_5.1.2 . -f Dockerfile-swoole diff --git a/php/82/Dockerfile b/php/82/Dockerfile index ad4180b..f09e436 100644 --- a/php/82/Dockerfile +++ b/php/82/Dockerfile @@ -5,7 +5,7 @@ RUN LIBXSLT_VERSION=libxslt-1.1.34 && wget http://xmlsoft.org/sources/${LIBXSLT_ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/download/${CURL_VERSION}.tar.xz && tar Jxf ${CURL_VERSION}.tar.xz && cd ${CURL_VERSION} && ./configure --with-openssl --enable-ares && make -j$(nproc) && make install RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.2.14 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \ +RUN PHP_VERSION=php-8.2.15 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \ export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && \ export LIBZIP_LIBS="-L/usr/local/lib64 -lzip" && \ export LIBZIP_CFLAGS=-I/usr/local/include && \ diff --git a/php/82/Dockerfile-mongo b/php/82/Dockerfile-mongo index 3b00d20..db8d255 100644 --- a/php/82/Dockerfile-mongo +++ b/php/82/Dockerfile-mongo @@ -6,7 +6,7 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.2.14 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.2.15 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary diff --git a/php/82/Dockerfile-redis b/php/82/Dockerfile-redis index 31355c7..f18d721 100644 --- a/php/82/Dockerfile-redis +++ b/php/82/Dockerfile-redis @@ -6,7 +6,7 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.2.14 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.2.15 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary diff --git a/php/82/Dockerfile-swoole b/php/82/Dockerfile-swoole index 7cd3c32..d900513 100644 --- a/php/82/Dockerfile-swoole +++ b/php/82/Dockerfile-swoole @@ -6,13 +6,13 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.2.14 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.2.15 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary RUN IMAGICK_VERSION=imagick-3.7.0 && cd php-8.*.* && wget https://pecl.php.net/get/${IMAGICK_VERSION}.tgz && tar zxf ${IMAGICK_VERSION}.tgz && mv ${IMAGICK_VERSION} ext/imagick RUN APCU_VERSION=apcu-5.1.23 && cd php-8.*.* && wget https://pecl.php.net/get/${APCU_VERSION}.tgz && tar zxf ${APCU_VERSION}.tgz && mv ${APCU_VERSION} ext/apcu -RUN SWOOLE_VERSION=swoole-5.1.1 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole +RUN SWOOLE_VERSION=swoole-5.1.2 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole RUN cd php-8.*.* && rm -rf configure && ./buildconf --force && \ export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && \ export LIBZIP_LIBS="-L/usr/local/lib64 -lzip" && \ diff --git a/php/82/make-redis.sh b/php/82/make-redis.sh index 6984a81..12b1afd 100755 --- a/php/82/make-redis.sh +++ b/php/82/make-redis.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:8.2.14_redis . -f Dockerfile-redis +docker build -t=suconghou/php:8.2.15_redis . -f Dockerfile-redis diff --git a/php/82/make-swoole.sh b/php/82/make-swoole.sh index 8963207..ff3adb3 100755 --- a/php/82/make-swoole.sh +++ b/php/82/make-swoole.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:8.2.14_swoole_5.1.1 . -f Dockerfile-swoole +docker build -t=suconghou/php:8.2.15_swoole_5.1.2 . -f Dockerfile-swoole diff --git a/php/82/make.sh b/php/82/make.sh index f9190ef..ed78549 100755 --- a/php/82/make.sh +++ b/php/82/make.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:8.2.14 . +docker build -t=suconghou/php:8.2.15 . diff --git a/php/Dockerfile b/php/Dockerfile index 11309e1..54d04ef 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -5,7 +5,7 @@ RUN LIBXSLT_VERSION=libxslt-1.1.34 && wget http://xmlsoft.org/sources/${LIBXSLT_ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/download/${CURL_VERSION}.tar.xz && tar Jxf ${CURL_VERSION}.tar.xz && cd ${CURL_VERSION} && ./configure --with-openssl --enable-ares && make -j$(nproc) && make install RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.3.1 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \ +RUN PHP_VERSION=php-8.3.2 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \ export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && \ export LIBZIP_LIBS="-L/usr/local/lib64 -lzip" && \ export LIBZIP_CFLAGS=-I/usr/local/include && \ diff --git a/php/Dockerfile-mongo b/php/Dockerfile-mongo index 1d68798..7394526 100644 --- a/php/Dockerfile-mongo +++ b/php/Dockerfile-mongo @@ -6,7 +6,7 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.3.1 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.3.2 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary diff --git a/php/Dockerfile-redis b/php/Dockerfile-redis index d66350c..7538b1e 100644 --- a/php/Dockerfile-redis +++ b/php/Dockerfile-redis @@ -6,7 +6,7 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.3.1 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.3.2 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary diff --git a/php/Dockerfile-swoole b/php/Dockerfile-swoole index eaceae6..9920a39 100644 --- a/php/Dockerfile-swoole +++ b/php/Dockerfile-swoole @@ -6,13 +6,13 @@ RUN CURL_VERSION=curl-8.4.0 && wget --no-check-certificate https://curl.haxx.se/ RUN LIBFREETYPE_VERSION=freetype-2.13.2 && wget --no-check-certificate https://download-mirror.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make -j$(nproc) && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config RUN LIBZIP_VERSION=libzip-1.10.1 && wget --no-check-certificate https://libzip.org/download/${LIBZIP_VERSION}.tar.xz && tar Jxf ${LIBZIP_VERSION}.tar.xz && cd ${LIBZIP_VERSION} && mkdir build && cd build && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j$(nproc) && make install RUN IMAGEMAGICK_VERSION=7.1.1-21 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads --without-fftw --without-perl --disable-opencl --without-modules --without-zip && make -j$(nproc) && make install -RUN PHP_VERSION=php-8.3.1 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} +RUN PHP_VERSION=php-8.3.2 && wget https://www.php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} RUN REDIS_VERSION=redis-6.0.2 && cd php-8.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis RUN MSGPACK_VERSION=msgpack-2.2.0 && cd php-8.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack RUN IGBINARY_VERSION=igbinary-3.2.14 && cd php-8.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary RUN IMAGICK_VERSION=imagick-3.7.0 && cd php-8.*.* && wget https://pecl.php.net/get/${IMAGICK_VERSION}.tgz && tar zxf ${IMAGICK_VERSION}.tgz && mv ${IMAGICK_VERSION} ext/imagick RUN APCU_VERSION=apcu-5.1.23 && cd php-8.*.* && wget https://pecl.php.net/get/${APCU_VERSION}.tgz && tar zxf ${APCU_VERSION}.tgz && mv ${APCU_VERSION} ext/apcu -RUN SWOOLE_VERSION=swoole-5.1.1 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole +RUN SWOOLE_VERSION=swoole-5.1.2 && cd php-8.*.* && wget https://pecl.php.net/get/${SWOOLE_VERSION}.tgz && tar zxf ${SWOOLE_VERSION}.tgz && mv ${SWOOLE_VERSION} ext/swoole RUN cd php-8.*.* && rm -rf configure && ./buildconf --force && \ export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && \ export LIBZIP_LIBS="-L/usr/local/lib64 -lzip" && \ diff --git a/php/make-redis.sh b/php/make-redis.sh index f138821..dd0228e 100755 --- a/php/make-redis.sh +++ b/php/make-redis.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:redis -t=suconghou/php:8.3.1_redis . -f Dockerfile-redis +docker build -t=suconghou/php:redis -t=suconghou/php:8.3.2_redis . -f Dockerfile-redis diff --git a/php/make-swoole.sh b/php/make-swoole.sh index dbd0679..ad7b3b2 100755 --- a/php/make-swoole.sh +++ b/php/make-swoole.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker build -t=suconghou/php:swoole -t=suconghou/php:8.3.1_swoole_5.1.1 . -f Dockerfile-swoole +docker build -t=suconghou/php:swoole -t=suconghou/php:8.3.2_swoole_5.1.2 . -f Dockerfile-swoole diff --git a/php/make.sh b/php/make.sh index 45cff0a..7654c9d 100755 --- a/php/make.sh +++ b/php/make.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker build -t=suconghou/php -t=suconghou/php:8.3.1 . && \ +docker build -t=suconghou/php -t=suconghou/php:8.3.2 . && \ docker build -t=suconghou/php:cli . -f Dockerfile-cli && \ docker build -t=suconghou/php:fpm . -f Dockerfile-fpm