rabin 7 anni fa
parent
commit
bf0cd206d0

+ 1 - 1
src/docker/build/dev/php/base/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 
 ENV COMPOSER_HOME=/share/lib/php
 
-RUN apk add --no-cache --update curl php5-fpm php5-mysql php5-pgsql php5-pdo_mysql php5-pdo_pgsql php5-gd php5-curl php5-mcrypt php5-json php5-zlib php5-xml php5-iconv php5-zip php5-phar php5-memcache php5-openssl php5-dom && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
+RUN apk add --no-cache --update curl php5-fpm php5-pear php5-mysql php5-pgsql php5-pdo_mysql php5-pdo_pgsql php5-gd php5-curl php5-mcrypt php5-json php5-zlib php5-xml php5-iconv php5-zip php5-phar php5-memcache php5-openssl php5-dom && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
 
 COPY php.sh /entrypoint/php.sh
 

+ 8 - 0
src/docker/build/dev/php/libevent/Dockerfile

@@ -0,0 +1,8 @@
+FROM docker.dever.cc/dev/php:latest
+
+MAINTAINER Rabin "https://github.com/shemic"
+
+RUN apk add --no-cache --update libevent-dev php5-xml && \
+	pecl install channel://pecl.php.net/libevent-0.1.0 && \
+	tar -zxvf libevent-0.1.0.tgz && \
+	echo extension=libevent.so > /etc/php5/conf.d/libevent.ini

+ 6 - 5
src/docker/build/dev/php/swoole/Dockerfile

@@ -1,15 +1,16 @@
-FROM docker.dever.cc/dev/php:latest
+FROM docker.dever.cc/dev/php/v7:latest
 
 MAINTAINER Rabin "https://github.com/shemic"
 
-RUN apk add --no-cache --update libaio-dev php5-dev autoconf gcc g++ make openssl-dev curl git && \
+RUN apk add --no-cache --update libaio-dev php7-dev autoconf gcc g++ make openssl-dev curl git && \
 	cd /tmp && \
-	git clone https://github.com/swoole/swoole-src.git && \
+	#git clone https://github.com/swoole/swoole-src.git && \
+	git clone https://gitee.com/swoole/swoole swoole-src && \
 	cd swoole-src && \
 	phpize && \
-	./configure --with-php-config=/usr/bin/php-config && \
+	./configure --with-php-config=/usr/bin/php-config --enable-coroutine && \
 	make && \
 	make install && \
 	cd .. && rm -rf swoole-src && \
-	apk del php5-dev m4 autoconf gcc g++ make openssl-dev curl git && \
+	apk del php7-dev m4 autoconf gcc g++ make openssl-dev curl git && \
 	rm -rf /tmp/* /var/cache/apk/*

+ 1 - 1
src/docker/build/dev/php/v7/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 
 ENV COMPOSER_HOME=/share/lib/php
 
-RUN apk add --no-cache --update curl php7-fpm php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-iconv php7-zip php7-phar php7-memcached php7-openssl php7-dom php7-redis php7-mbstring php7-simplexml && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
+RUN apk add --no-cache --update curl php7-fpm php7-pear php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-iconv php7-zip php7-phar php7-memcached php7-openssl php7-dom php7-redis php7-mbstring php7-simplexml && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
 
 COPY php.sh /entrypoint/php.sh
 

+ 2 - 2
src/docker/conf/web.conf

@@ -20,7 +20,7 @@ volumes_from = [mysql]{num}
 volumes = {container}web:/www,{container}conf/web/php:/etc/php5
 #host = test:127.0.0.1,test1:127.0.0.1
 # 容器里对宿主机提供的指令的别名,可以直接用php -i访问容器中的php命令了
-alias = php,composer
+alias = php,composer,pecl,apk
 
 [php]
 image = php7
@@ -30,7 +30,7 @@ volumes_from = [mysql]{num}
 volumes = {container}web:/www,{container}conf/web/php7:/etc/php7
 #host = test:127.0.0.1,test1:127.0.0.1
 # 容器里对宿主机提供的指令的别名,可以直接用php -i访问容器中的php命令了
-alias = php,composer
+alias = php,composer,pecl,apk
 
 [nginx]
 port = 80:80,443:443

+ 2 - 0
src/docker/core.conf

@@ -14,7 +14,9 @@ alpine_glibc		= os/alpine/glibc
 ;dev
 php_base			= dev/php/base
 php					= dev/php
+php_libevent		= dev/php/libevent
 php7				= dev/php/v7
+swoole				= dev/php/swoole
 java				= dev/java
 java_base			= java/base
 maven				= java/maven