From 79ee69d0e541e706ac77a493eec571f080ce70e1 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Fri, 6 Dec 2024 10:17:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7openresty?= =?UTF-8?q?=E5=88=B01.19=20#11295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-images/core/ci/dockerfile/openresty.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-images/core/ci/dockerfile/openresty.Dockerfile b/docker-images/core/ci/dockerfile/openresty.Dockerfile index e6d281614bf..f69815384a8 100644 --- a/docker-images/core/ci/dockerfile/openresty.Dockerfile +++ b/docker-images/core/ci/dockerfile/openresty.Dockerfile @@ -8,15 +8,15 @@ ENV INSTALL_PATH="/data/tmp/installfiles" RUN mkdir -p ${INSTALL_PATH} &&\ wget https://openresty.org/package/centos/7/x86_64/openresty-zlib-1.2.11-3.el7.centos.x86_64.rpm -P ${INSTALL_PATH} &&\ wget https://openresty.org/package/centos/7/x86_64/openresty-pcre-8.44-1.el7.x86_64.rpm -P ${INSTALL_PATH} &&\ - wget https://openresty.org/package/centos/7/x86_64/openresty-openssl111-1.1.1g-3.el7.x86_64.rpm -P ${INSTALL_PATH} &&\ - wget https://openresty.org/package/centos/7/x86_64/openresty-1.17.8.2-1.el7.x86_64.rpm -P ${INSTALL_PATH} + wget https://openresty.org/package/centos/7/x86_64/openresty-openssl111-1.1.1w-1.el7.x86_64.rpm -P ${INSTALL_PATH} &&\ + wget https://openresty.org/package/centos/7/x86_64/openresty-1.19.9.1-1.el7.x86_64.rpm -P ${INSTALL_PATH} # 安装 RUN chmod 775 ${INSTALL_PATH}/*.rpm &&\ rpm -ivh ${INSTALL_PATH}/openresty-zlib-1.2.11-3.el7.centos.x86_64.rpm --replacefiles &&\ rpm -ivh ${INSTALL_PATH}/openresty-pcre-8.44-1.el7.x86_64.rpm --replacefiles &&\ - rpm -ivh ${INSTALL_PATH}/openresty-openssl111-1.1.1g-3.el7.x86_64.rpm --replacefiles &&\ - rpm -ivh ${INSTALL_PATH}/openresty-1.17.8.2-1.el7.x86_64.rpm --replacefiles + rpm -ivh ${INSTALL_PATH}/openresty-openssl111-1.1.1w-1.el7.x86_64.rpm --replacefiles &&\ + rpm -ivh ${INSTALL_PATH}/openresty-1.19.9.1-1.el7.x86_64.rpm --replacefiles # 删除文件 RUN rm -rf ${INSTALL_PATH} From f08107a04f848352567216c4ff492be0d76ba233 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Fri, 13 Dec 2024 14:42:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7openresty?= =?UTF-8?q?=E5=88=B01.19=20#11295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-images/core/ci/dockerfile/gateway.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-images/core/ci/dockerfile/gateway.Dockerfile b/docker-images/core/ci/dockerfile/gateway.Dockerfile index 0bc3b83a2d2..db05caa1193 100644 --- a/docker-images/core/ci/dockerfile/gateway.Dockerfile +++ b/docker-images/core/ci/dockerfile/gateway.Dockerfile @@ -1,4 +1,4 @@ -FROM bkci/openresty:0.0.1 +FROM bkci/openresty:0.0.2 LABEL maintainer="Tencent BlueKing Devops"