V6.11.0

Author: bwcxyk

Dockerfile

@@ -1,17 +1,18 @@
 # debian
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ARG NGINX_VERSION=1.26.2
 
 ENV TZ "Asia/Shanghai"
 
 # conf
-COPY conf/* /opt/
-COPY fastdfs.sh /home/
+COPY conf/* /home/
+COPY fastdfs.sh /usr/local/bin/
 
 # run
 # install packages
 RUN set -x \
+    # && sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list.d/debian.sources \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -28,34 +29,35 @@ RUN set -x \
 
 # git clone libfastcommon / libserverframe / fastdfs / fastdfs-nginx-module
 RUN set -x \
-    && cd /usr/local/src \
-    && git clone -b V1.0.68 https://github.com/happyfish100/libfastcommon.git --depth 1 \
-    && git clone -b V1.1.28 https://github.com/happyfish100/libserverframe.git --depth 1 \
-    && git clone -b V6.09 https://github.com/happyfish100/fastdfs.git --depth 1 \
-    && git clone -b V1.23 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
+    && mkdir /opt/tmp \
+    && 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 V1.24 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
     && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz
 # build libfastcommon / libserverframe / fastdfs
 RUN set -x \
-    && mkdir /home/dfs \
-    && cd /usr/local/src  \
-    && cd /usr/local/src/libfastcommon \
+    && mkdir /opt/fastdfs \
+    && cd /opt/tmp  \
+    && cd /opt/tmp/libfastcommon \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src/libserverframe \
+    && cd /opt/tmp/libserverframe \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src/fastdfs \
+    && cd /opt/tmp/fastdfs \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src \
+    && cd /opt/tmp \
     && tar -zxvf nginx-$NGINX_VERSION.tar.gz \
-    && cd /usr/local/src/nginx-$NGINX_VERSION \
-    && ./configure --add-module=/usr/local/src/fastdfs-nginx-module/src \
+    && cd /opt/tmp/nginx-$NGINX_VERSION \
+    && ./configure --add-module=/opt/tmp/fastdfs-nginx-module/src \
     && make && make install \
-    && chmod +x /home/fastdfs.sh
+    && chmod +x /usr/local/bin/fastdfs.sh
 
-RUN cp /usr/local/src/fastdfs/init.d/fdfs_trackerd /etc/init.d/fdfs_trackerd \
-    && cp /usr/local/src/fastdfs/init.d/fdfs_storaged /etc/init.d/fdfs_storaged \
-    && rm -rf /usr/local/src*
+RUN cp /opt/tmp/fastdfs/init.d/fdfs_trackerd /usr/local/bin/fdfs_trackerd \
+    && cp /opt/tmp/fastdfs/init.d/fdfs_storaged /usr/local/bin/fdfs_storaged \
+    && rm -rf /opt/tmp
 
-VOLUME /home/dfs
+VOLUME /opt/fastdfs
 
 EXPOSE 22122 23000 80
-ENTRYPOINT ["/home/fastdfs.sh"]
+ENTRYPOINT ["fastdfs.sh"]

Dockerfile-alpine

@@ -1,53 +1,56 @@
 #基础镜像
-FROM alpine:3.18
+FROM alpine:3.20
 
 ARG NGINX_VERSION=1.26.2
 
 ENV TZ "Asia/Shanghai"
 
 # conf
-COPY conf/* /opt/
-COPY fastdfs.sh /home/
+COPY conf/* /home/
+COPY fastdfs.sh /usr/local/bin/
 
 # run
 # install packages
 RUN set -x \
+    # && sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://mirrors.tuna.tsinghua.edu.cn/alpine#g' /etc/apk/repositories \
     && apk update \
     && apk add --no-cache --virtual .build-deps alpine-sdk build-base perl-dev openssl-dev pcre-dev zlib-dev git
+
 # git clone libfastcommon / libserverframe / fastdfs / fastdfs-nginx-module
 RUN set -x \
-    && mkdir -p /usr/local/src \
-    && cd /usr/local/src \
-    && git clone -b V1.0.68 https://github.com/happyfish100/libfastcommon.git --depth 1 \
-    && git clone -b V1.1.28 https://github.com/happyfish100/libserverframe.git --depth 1 \
-    && git clone -b V6.09 https://github.com/happyfish100/fastdfs.git --depth 1 \
-    && git clone -b V1.23 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
+    && mkdir -p /opt/tmp \
+    && 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 V1.24 https://github.com/happyfish100/fastdfs-nginx-module.git --depth 1 \
     && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz
+
 # build libfastcommon / libserverframe / fastdfs
 RUN set -x \
-    && mkdir /home/dfs \
-    && cd /usr/local/src  \
-    && cd /usr/local/src/libfastcommon \
+    && mkdir /opt/fastdfs \
+    && cd /opt/tmp  \
+    && cd /opt/tmp/libfastcommon \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src/libserverframe \
+    && cd /opt/tmp/libserverframe \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src/fastdfs \
+    && cd /opt/tmp/fastdfs \
     && ./make.sh && ./make.sh install \
-    && cd /usr/local/src \
+    && cd /opt/tmp \
     && tar -zxvf nginx-$NGINX_VERSION.tar.gz \
-    && cd /usr/local/src/nginx-$NGINX_VERSION \
-    && ./configure --add-module=/usr/local/src/fastdfs-nginx-module/src \
+    && cd /opt/tmp/nginx-$NGINX_VERSION \
+    && ./configure --add-module=/opt/tmp/fastdfs-nginx-module/src \
     && make && make install \
     && apk del .build-deps \
     && apk add --no-cache pcre-dev bash curl tzdata \
-    && chmod +x /home/fastdfs.sh
+    && chmod +x /usr/local/bin/fastdfs.sh
 
-RUN cp /usr/local/src/fastdfs/init.d/fdfs_trackerd /etc/init.d/fdfs_trackerd \
-    && cp /usr/local/src/fastdfs/init.d/fdfs_storaged /etc/init.d/fdfs_storaged \
-    && rm -rf /usr/local/src*
+RUN cp /opt/tmp/fastdfs/init.d/fdfs_trackerd /usr/local/bin/fdfs_trackerd \
+    && cp /opt/tmp/fastdfs/init.d/fdfs_storaged /usr/local/bin/fdfs_storaged \
+    && rm -rf /opt/tmp*
 
-VOLUME /home/dfs
+VOLUME /opt/fastdfs
 
 EXPOSE 22122 23000 80
 
-CMD ["/home/fastdfs.sh"]
+CMD ["fastdfs.sh"]

conf/client.conf

@@ -1,17 +1,30 @@
 # connect timeout in seconds
 # default value is 30s
-connect_timeout=30
+# Note: in the intranet network (LAN), 2 seconds is enough.
+connect_timeout = 5
 
 # network timeout in seconds
 # default value is 30s
-network_timeout=60
+network_timeout = 60
 
 # the base path to store log files
-base_path=/home/dfs
+base_path = /opt/fastdfs
 
-# tracker_server can ocur more than once, and tracker_server format is
-#  "host:port", host can be hostname or ip address
-tracker_server=###TRACKER###
+# tracker_server can ocur more than once for multi tracker servers.
+# the value format of tracker_server is "HOST:PORT",
+#   the HOST can be hostname or ip address,
+#   and the HOST can be dual IPs or hostnames seperated by comma,
+#   the dual IPS must be an inner (intranet) IP and an outer (extranet) IP,
+#   or two different types of inner (intranet) IPs.
+#   IPv4:
+#   for example: 192.168.2.100,122.244.141.46:22122
+#   another eg.: 192.168.1.10,172.17.4.21:22122
+#
+#   IPv6:
+#    for example: [2409:8a20:42d:2f40:587a:4c47:72c0:ad8e,fe80::1ee9:90a8:1351:436c]:22122
+#
+# tracker_server = 192.168.0.196:22122
+tracker_server = ###TRACKER###
 
 #standard log level as syslog, case insensitive, value list:
 ### emerg for emergency
@@ -22,7 +35,14 @@ tracker_server=###TRACKER###
 ### notice
 ### info
 ### debug
-log_level=info
+log_level = info
+
+# connect which ip address first for multi IPs of a storage server, value list:
+## tracker: connect to the ip address return by tracker server first
+## last-connected: connect to the ip address last connected first
+# default value is tracker
+# since V6.11
+connect_first_by = tracker
 
 # if use connection pool
 # default value is false
@@ -38,7 +58,7 @@ connection_pool_max_idle_time = 3600
 # if load FastDFS parameters from tracker server
 # since V4.05
 # default value is false
-load_fdfs_parameters_from_tracker=false
+load_fdfs_parameters_from_tracker = false
 
 # if use storage ID instead of IP address
 # same as tracker.conf
@@ -55,7 +75,7 @@ storage_ids_filename = storage_ids.conf
 
 
 #HTTP settings
-http.tracker_server_port=80
+http.tracker_server_port = 80
 
 #use "#include" directive to include HTTP other settiongs
 ##include http.conf

conf/mod_fastdfs.conf

@@ -1,18 +1,18 @@
 # connect timeout in seconds
 # default value is 30s
-connect_timeout=2
+connect_timeout = 2
 
 # network recv and send timeout in seconds
 # default value is 30s
-network_timeout=30
+network_timeout = 30
 
 # the base path to store log files
-base_path=/tmp
+base_path = /tmp
 
 # if load FastDFS parameters from tracker server
 # since V1.12
 # default value is false
-load_fdfs_parameters_from_tracker=true
+load_fdfs_parameters_from_tracker = true
 
 # storage sync file max delay seconds
 # same as tracker.conf
@@ -37,14 +37,14 @@ storage_ids_filename = storage_ids.conf
 # FastDFS tracker_server can ocur more than once, and tracker_server format is
 #  "host:port", host can be hostname or ip address
 # valid only when load_fdfs_parameters_from_tracker is true
-tracker_server=###TRACKER###
+tracker_server = ###TRACKER###
 
 # the port of the local storage server
 # the default value is 23000
-storage_server_port=23000
+storage_server_port = 23000
 
 # the group name of the local storage server
-group_name=group1
+group_name = group1
 
 # if the url / uri including the group name
 # set to false when uri like /M00/00/00/xxx
@@ -54,12 +54,12 @@ url_have_group_name = true
 
 # path(disk or mount point) count, default value is 1
 # must same as storage.conf
-store_path_count=1
+store_path_count = 1
 
 # store_path#, based 0, if store_path0 not exists, it's value is base_path
 # the paths must be exist
 # must same as storage.conf
-store_path0=/home/dfs
+store_path0 = /opt/fastdfs
 #store_path1=/home/yuqing/fastdfs1
 
 # standard log level as syslog, case insensitive, value list:
@@ -71,22 +71,22 @@ store_path0=/home/dfs
 ### notice
 ### info
 ### debug
-log_level=info
+log_level = info
 
 # set the log filename, such as /usr/local/apache2/logs/mod_fastdfs.log
 # empty for output to stderr (apache and nginx error_log file)
-log_filename=
+log_filename =
 
 # response mode when the file not exist in the local file system
 ## proxy: get the content from other storage server, then send to client
 ## redirect: redirect to the original storage server (HTTP Header is Location)
-response_mode=proxy
+response_mode = proxy
 
 # the NIC alias prefix, such as eth in Linux, you can see it by ifconfig -a
 # multi aliases split by comma. empty value means auto set by OS type
 # this paramter used to get all ip address of the local host
 # default values is empty
-if_alias_prefix=
+if_alias_prefix =
 
 # use "#include" directive to include HTTP config file
 # NOTE: #include is an include directive, do NOT remove the # before include
@@ -129,5 +129,4 @@ group_count = 0
 #group_name=group2
 #storage_server_port=23000
 #store_path_count=1
-#store_path0=/home/yuqing/fastdfs
-
+#store_path0=/home/yuqing/fastdfs