pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from SaintKayLuk/master 

Dockerfile文件小bug
pull/484/head
YuQing 2019-11-22 07:26:57 +08:00 committed by GitHub
parent add02e7348 52ac538a71
commit 2f94d24e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/dockerfile_local/Dockerfile
View File

@ -1,5 +1,5 @@
# centos 7 # centos 7
FROM centos FROM centos:7
# 添加配置文件 # 添加配置文件
# add profiles # add profiles
ADD conf/client.conf /etc/fdfs/ ADD conf/client.conf /etc/fdfs/
@ -19,7 +19,7 @@ ADD source/fastdfs-nginx-module.tar.gz /usr/local/src/
ADD source/nginx-1.15.4.tar.gz /usr/local/src/ ADD source/nginx-1.15.4.tar.gz /usr/local/src/
# Run # Run
RUN yum install git gcc gcc-c ++ make automake autoconf libtool pcre pcre-devel zlib zlib-devel openssl-devel wget vim -y \ RUN yum install git gcc gcc-c++ make automake autoconf libtool pcre pcre-devel zlib zlib-devel openssl-devel wget vim -y \
&& mkdir /home/dfs \ && mkdir /home/dfs \
&& cd /usr/local/src/ \ && cd /usr/local/src/ \
&& cd libfastcommon/ \ && cd libfastcommon/ \

4
docker/dockerfile_network/Dockerfile
View File

@ -1,5 +1,5 @@
# centos 7 # centos 7
FROM centos FROM centos:7
# 添加配置文件 # 添加配置文件
ADD conf/client.conf /etc/fdfs/ ADD conf/client.conf /etc/fdfs/
ADD conf/http.conf /etc/fdfs/ ADD conf/http.conf /etc/fdfs/
@ -11,7 +11,7 @@ ADD conf/nginx.conf /etc/fdfs/
ADD conf/mod_fastdfs.conf /etc/fdfs ADD conf/mod_fastdfs.conf /etc/fdfs
# run # run
RUN yum install git gcc gcc-c ++ make automake autoconf libtool pcre pcre-devel zlib zlib-devel openssl-devel wget vim -y \ RUN yum install git gcc gcc-c++ make automake autoconf libtool pcre pcre-devel zlib zlib-devel openssl-devel wget vim -y \
&& cd /usr/local/src \ && cd /usr/local/src \
&& git clone https://github.com/happyfish100/libfastcommon.git --depth 1 \ && git clone https://github.com/happyfish100/libfastcommon.git --depth 1 \
&& git clone https://github.com/happyfish100/fastdfs.git --depth 1 \ && git clone https://github.com/happyfish100/fastdfs.git --depth 1 \