From ad36100507531c1e1d789cd43f4849285fe0e436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= <dongyu.li@luxcreo.ai>
Date: Mon, 3 Jul 2023 11:04:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E5=A2=9E=E5=8A=A0=208.2=20?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                    | 16 ++++++++--------
 swoole/7.4/Dockerfile          |  2 +-
 swoole/8.1/Dockerfile          |  2 +-
 swoole/{7.3 => 8.2}/Dockerfile |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename swoole/{7.3 => 8.2}/Dockerfile (93%)

diff --git a/Jenkinsfile b/Jenkinsfile
index c7ffd14..c5fe84f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,13 +1,6 @@
 pipeline {
     agent any
     stages {
-        stage('Build 7.3-swoole') {
-            steps {
-                sh 'docker login harbor.luxcreo.cn -u \'robot$library+jenkinsfile\' -p Bw0teIfUhP7WBd1yDp7DTWSbF0d5nVvE'
-                sh 'docker build -t harbor.luxcreo.cn/library/hyperf:7.3-swoole -f swoole/7.3/Dockerfile .'
-                sh 'docker push harbor.luxcreo.cn/library/hyperf:7.3-swoole'
-            }
-        }
         stage('Build 7.4-swoole') {
             steps {
                 sh 'docker login harbor.luxcreo.cn -u \'robot$library+jenkinsfile\' -p Bw0teIfUhP7WBd1yDp7DTWSbF0d5nVvE'
@@ -29,9 +22,16 @@ pipeline {
                 sh 'docker push harbor.luxcreo.cn/library/hyperf:8.1-swoole'
             }
         }
+        stage('Build 8.2-swoole') {
+            steps {
+                sh 'docker login harbor.luxcreo.cn -u \'robot$library+jenkinsfile\' -p Bw0teIfUhP7WBd1yDp7DTWSbF0d5nVvE'
+                sh 'docker build -t harbor.luxcreo.cn/library/hyperf:8.2-swoole -f swoole/8.2/Dockerfile .'
+                sh 'docker push harbor.luxcreo.cn/library/hyperf:8.2-swoole'
+            }
+        }
         stage('Build Latest') {
             steps {
-                sh 'docker tag harbor.luxcreo.cn/library/hyperf:8.1-swoole harbor.luxcreo.cn/library/hyperf:latest'
+                sh 'docker tag harbor.luxcreo.cn/library/hyperf:8.2-swoole harbor.luxcreo.cn/library/hyperf:latest'
                 sh 'docker push harbor.luxcreo.cn/library/hyperf:latest'
             }
         }
diff --git a/swoole/7.4/Dockerfile b/swoole/7.4/Dockerfile
index 0a1134b..81665d1 100644
--- a/swoole/7.4/Dockerfile
+++ b/swoole/7.4/Dockerfile
@@ -3,7 +3,7 @@
 # @link     https://studio.luxcreo.cn/
 # @contact  dongyun.li@luxcreo.cn
 
-FROM hyperf/hyperf:7.4-alpine-v3.14-swoole
+FROM hyperf/hyperf:7.4-alpine-v3.15-swoole
 LABEL maintainer="李东云 <dongyun.li@luxcreo.ai>" version="1.0" license="MIT" app.name="LuxHyperf"
 
 ##
diff --git a/swoole/8.1/Dockerfile b/swoole/8.1/Dockerfile
index ef04536..78a53fa 100644
--- a/swoole/8.1/Dockerfile
+++ b/swoole/8.1/Dockerfile
@@ -3,7 +3,7 @@
 # @link     https://studio.luxcreo.cn/
 # @contact  dongyun.li@luxcreo.cn
 
-FROM hyperf/hyperf:8.1-alpine-v3.16-swoole
+FROM hyperf/hyperf:8.1-alpine-v3.18-swoole
 LABEL maintainer="李东云 <dongyun.li@luxcreo.ai>" version="1.0" license="MIT" app.name="LuxHyperf"
 
 ##
diff --git a/swoole/7.3/Dockerfile b/swoole/8.2/Dockerfile
similarity index 93%
rename from swoole/7.3/Dockerfile
rename to swoole/8.2/Dockerfile
index 8d5c3f7..8836131 100644
--- a/swoole/7.3/Dockerfile
+++ b/swoole/8.2/Dockerfile
@@ -3,7 +3,7 @@
 # @link     https://studio.luxcreo.cn/
 # @contact  dongyun.li@luxcreo.cn
 
-FROM hyperf/hyperf:7.3-alpine-v3.11-swoole
+FROM hyperf/hyperf:8.2-alpine-v3.18-swoole
 LABEL maintainer="李东云 <dongyun.li@luxcreo.ai>" version="1.0" license="MIT" app.name="LuxHyperf"
 
 ##
@@ -21,7 +21,7 @@ RUN set -ex \
     && php -m \
     && php --ri swoole \
     #  ---------- some config ----------
-    && cd /etc/php7 \
+    && cd /etc/php81 \
     # - config PHP
     && { \
     echo "upload_max_filesize=128M"; \