From 86cd69ed2dfb5cc662e36498d11d63ed60950974 Mon Sep 17 00:00:00 2001 From: saintkay <30994129+SaintKayLuk@users.noreply.github.com> Date: Wed, 13 Nov 2019 17:15:22 +0800 Subject: [PATCH 1/2] Update Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改小bug --- docker/dockerfile_network/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/dockerfile_network/Dockerfile b/docker/dockerfile_network/Dockerfile index ff82a1b..8a7bdb3 100644 --- a/docker/dockerfile_network/Dockerfile +++ b/docker/dockerfile_network/Dockerfile @@ -1,5 +1,5 @@ # centos 7 -FROM centos +FROM centos:7 # 添加配置文件 ADD conf/client.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 # 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 \ && git clone https://github.com/happyfish100/libfastcommon.git --depth 1 \ && git clone https://github.com/happyfish100/fastdfs.git --depth 1 \ From 52ac538a71fc9753c9dbcd4c75f581e9402f39a5 Mon Sep 17 00:00:00 2001 From: saintkay <30994129+SaintKayLuk@users.noreply.github.com> Date: Wed, 13 Nov 2019 17:22:45 +0800 Subject: [PATCH 2/2] Update Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加centos版本, gcc-c ++ 改为gcc-c++ --- docker/dockerfile_local/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/dockerfile_local/Dockerfile b/docker/dockerfile_local/Dockerfile index 79df7bc..d7b7179 100644 --- a/docker/dockerfile_local/Dockerfile +++ b/docker/dockerfile_local/Dockerfile @@ -1,5 +1,5 @@ # centos 7 -FROM centos +FROM centos:7 # 添加配置文件 # add profiles 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/ # 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 \ && cd /usr/local/src/ \ && cd libfastcommon/ \