V6.12.2

Author: bwcxyk

.github/workflows/deploy_images.yml

@@ -1,10 +1,12 @@
 name: docker-image
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+  release:
+    types: [published]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   debian_deploy:
@@ -34,7 +36,7 @@ jobs:
           platforms: linux/amd64
           file: Dockerfile
           tags: |
-            yaokun/fastdfs:V6.11
+            yaokun/fastdfs:${{ github.event.release.tag_name }}
             yaokun/fastdfs:latest
 
   alpine_deploy:
@@ -64,5 +66,5 @@ jobs:
           platforms: linux/amd64
           file: Dockerfile-alpine
           tags: |
-            yaokun/fastdfs:V6.11-alpine
+            yaokun/fastdfs:${{ github.event.release.tag_name }}-alpine
             yaokun/fastdfs:alpine

Dockerfile

@@ -20,9 +20,9 @@ RUN set -x \
     && ls /opt \
     && cd /opt/tmp \
     # git clone libfastcommon, libserverframe, fastdfs, fastdfs-nginx-module
-    && git clone -b V1.0.71 https://github.com/happyfish100/libfastcommon.git --depth 1 \
-    && git clone -b V1.2.1 https://github.com/happyfish100/libserverframe.git --depth 1 \
-    && git clone -b V6.11.0 https://github.com/happyfish100/fastdfs.git --depth 1 \
+    && git clone -b V6.12.2 https://github.com/happyfish100/fastdfs.git --depth 1 \
+    && git clone -b V1.0.75 https://github.com/happyfish100/libfastcommon.git --depth 1 \
+    && git clone -b V1.2.5 https://github.com/happyfish100/libserverframe.git --depth 1 \
     && git clone -b V1.24 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
     && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
     && tar -zxvf nginx-$NGINX_VERSION.tar.gz \

Dockerfile-alpine

@@ -18,9 +18,9 @@ RUN set -eux \
     # git clone libfastcommon / libserverframe / fastdfs / fastdfs-nginx-module
     && mkdir /opt/tmp /opt/fastdfs \
     && cd /opt/tmp \
-    && git clone -b V1.0.71 https://github.com/happyfish100/libfastcommon.git --depth 1 \
-    && git clone -b V1.2.1 https://github.com/happyfish100/libserverframe.git --depth 1 \
-    && git clone -b V6.11.0 https://github.com/happyfish100/fastdfs.git --depth 1 \
+    && git clone -b V6.12.2 https://github.com/happyfish100/fastdfs.git --depth 1 \
+    && git clone -b V1.0.75 https://github.com/happyfish100/libfastcommon.git --depth 1 \
+    && git clone -b V1.2.5 https://github.com/happyfish100/libserverframe.git --depth 1 \
     && git clone -b V1.24 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
     && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz \
     && tar -zxvf nginx-$NGINX_VERSION.tar.gz \

README.md

@@ -1,7 +1,19 @@
 # FastDFS
 
+### 版本说明
+
+|   FastDFS   | libfastcommon | libserverframe | fastdfs-nginx-module |
+| :---------: | :-----------: | :------------: | :------------------: |
+| **v6.12.2** |    v1.0.75    |     v1.2.5     |        v1.24         |
+| **v6.11.0** |    v1.0.71    |     v1.2.1     |        v1.24         |
+| **v6.10.0** |    v1.0.70    |    v1.1.28     |        v1.22         |
+|  **v6.09**  |    v1.0.68    |    v1.1.28     |        v1.23         |
+|  **v5.05**  |    v1.0.7     |   **不需要**   |        v1.20         |
+
+FastDFS v6.x 开始必须依赖 `libserverframe`（网络框架库），v5.x 及以下版本无需。
 
 ## 目录介绍
+
 ### conf
 Dockerfile 所需要的一些配置文件
 当然你也可以对这些文件进行一些修改  比如`storage.conf`里面的`bast_path`等相关