docker file

Author: sioomy

README.md

@@ -195,13 +195,13 @@ docker run --privileged -p 8083:80 phpcoro/php-fpm-coro
 
 ## 项目调试方法三，Docker build安装:
 
-1.进入tutorial/，执行:
+1.进入项目根目录，执行:
 ```
-docker build -t php-fpm-coro ./
+docker build -t php-fpm-coro -f tutorial/Dockerfile ./
 ```
 2.运行docker:
 ```
-docker run --privileged -p 8083:80 -v `pwd`:/data/soft/php-fpm-coroutine/tutorial php-fpm-coro
+docker run --privileged -p 8083:80 -v `pwd`/tutorial:/data/soft/php-fpm-coroutine/tutorial php-fpm-coro
 ```
 3.浏览器输入网址
 ```
@@ -439,16 +439,16 @@ docker run --privileged -p 8083:80 phpcoro/php-fpm-coro
 
 
 
-1. enter tutorial/, execute:
+1. enter root dir of project, execute:
 
 ```
-docker build -t php-fpm-coro ./
+docker build -t php-fpm-coro -f tutorial/Dockerfile ./
 ```
 
 2. run docker:
 
 ```
-docker run --privileged -p 8083:80 -v `pwd`:/data/soft/php-fpm-coro/tutorial php-fpm-coro
+docker run --privileged -p 8083:80 -v `pwd`/tutorial:/data/soft/php-fpm-coro/tutorial php-fpm-coro
 ```
 
 3. browsers enter the URL

tutorial/Dockerfile

@@ -14,7 +14,6 @@ RUN yum -y install openssl-devel
 RUN yum -y install wget
 RUN yum -y install freetype-devel
 RUN yum -y install libjpeg-devel
-RUN yum -y install freetds-devel
 RUN yum -y install unixODBC-devel
 RUN yum -y install libpng-devel
 RUN yum -y install aspell-devel
@@ -25,15 +24,20 @@ RUN yum -y install curl-devel
 RUN yum -y install gdbm-devel
 RUN yum -y install libicu-devel
 RUN yum -y install openldap-devel
-RUN yum -y install libmcrypt-devel
+RUN yum -y install libtomcrypt-devel
 RUN yum -y install libxslt-devel
 RUN yum -y install libzip-devel
 RUN yum -y install libedit-devel
 RUN yum -y install postgresql-devel
 RUN yum -y install gcc-c++
+RUN yum -y install libxml2-devel
 
 
 
+RUN cd /data/soft/ && wget http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz
+RUN cd /data/soft/ && tar zxvf freetds-stable.tgz
+RUN cd /data/soft/freetds-* && ./configure --prefix=/usr --sysconfdir=/etc --with-tdsver=0.91 --enable-msdblib && make && make install
+
 RUN cd /data/soft/ && wget http://mirrors.tuna.tsinghua.edu.cn/epel/epel-release-latest-7.noarch.rpm
 RUN cd /data/soft/ && rpm -ivh epel-release-latest-7.noarch.rpm
 RUN yum -y install supervisor
@@ -42,20 +46,22 @@ RUN cd /data/soft/ && wget http://nih.at/libzip/libzip-1.2.0.tar.gz
 RUN cd /data/soft/ && tar zxvf libzip-1.2.0.tar.gz && cd libzip-1.2.0 && ./configure && make && make install
 RUN cp /usr/local/lib/libzip/include/zipconf.h /usr/local/include/zipconf.h
 
-RUN ln -s /usr/lib64/libsybdb.so /usr/lib/lib/libsybdb.so
+#RUN ln -s /usr/lib64/libsybdb.so /usr/lib/libsybdb.so
 #RUN ln -s /usr/lib64/libgdbm.so /usr/lib/libgdbm.so
 RUN ln -s /usr/lib64/libldap.so /usr/lib/libldap.so
 RUN ln -s /usr/lib64/liblber* /usr/lib/
 
 
-RUN cd /data/soft/ && git clone http://.com/phpcoro/php-fpm-coro.git
+#RUN cd /data/soft/ && git clone https://.com/phpcoro/php-fpm-coro.git
+ADD ./ /data/soft/php-fpm-coro
+
 RUN cd /data/soft/ && git clone http://.com/libevent/libevent.git
-RUN cd /data/soft/ && git clone http://.com/GNOME/libxml2.git
+#RUN cd /data/soft/ && git clone http://.com/GNOME/libxml2.git
 RUN cd /data/soft/ && wget http://nginx.org/download/nginx-1.14.0.tar.gz
 RUN cd /data/soft/ && tar zxf nginx-1.14.0.tar.gz
 
 RUN cd /data/soft/libevent && sh autogen.sh && ./configure && make && make install
-RUN cd /data/soft/libxml2 && sh autogen.sh && ./configure && make && make install
+#RUN cd /data/soft/libxml2 && sh autogen.sh && ./configure && make && make install
 RUN cd /data/soft/php-fpm-coro && sh buildconf --force && ./configure --prefix=/usr/local/php7 --enable-fpm --enable-coro_http --enable-mysqlnd --enable-zip --with-pdo-mysql --with-openssl --enable-maintainer-zts --enable-opcache-file --with-curl --enable-bcmath --enable-calendar --enable-dtrace --enable-exif --enable-ftp --enable-mbregex --enable-mbstring --enable-pcntl --enable-phpdbg --enable-phpdbg-webhelper --enable-shmop --enable-soap --enable-sockets --enable-sysvmsg --enable-sysvsem --enable-sysvshm --enable-wddx --with-bz2 --with-iconv --with-pic --with-xmlrpc --with-mhash --with-mysql-sockunixunix=/tmp/mysql.sock --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd --with-kerberos --with-layout=GNU --with-mcrypt=/usr/include --with-gd --with-jpeg-dir=/usr/include --with-png-dir=/usr/include --with-webp-dir=/usr/include --with-freetype-dir=/usr/include --with-icu-dir=/usr --with-pspell --with-xsl --with-libzip --enable-zip --with-zlib --with-pdo-dblib --with-pdo-odbc=unixODBC,/usr --with-unixODBC=/usr --with-libedit --enable-dba --with-ldap --with-ldap-sasl --with-pdo-pgsql --with-pgsql --with-gdbm --enable-intl && make && make install
 RUN cd /data/soft/nginx-1.14.0 && ./configure && make && make install