rabin 7 년 전
부모
커밋
96a9bcb24a
4개의 변경된 파일47개의 추가작업 그리고 2개의 파일을 삭제
  1. 15 0
      src/docker/build/dev/php/v7/Dockerfile
  2. 19 0
      src/docker/build/dev/php/v7/php.sh
  3. 11 1
      src/docker/conf/web.conf
  4. 2 1
      src/docker/core.conf

+ 15 - 0
src/docker/build/dev/php/v7/Dockerfile

@@ -0,0 +1,15 @@
+FROM docker.dever.cc/os/alpine:latest
+
+MAINTAINER Rabin "https://github.com/shemic"
+
+ENV COMPOSER_HOME=/share/lib/php
+
+RUN apk add --no-cache --update curl php7-fpm php7-mysqli 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 && 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
+
+VOLUME ["/www", "/etc/php7"]
+
+EXPOSE 9000
+
+CMD ["php"]

+ 19 - 0
src/docker/build/dev/php/v7/php.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+set -e
+PHP="php-fpm7"
+start_php()
+{
+	# 使用exec 将替换主进程,信号检测将失效,无法执行end_php
+	#exec php-fpm
+	process_start $PHP
+}
+
+stop_php()
+{
+	process_stop $PHP
+}
+
+monit_php()
+{
+	process_monit $PHP
+}

+ 11 - 1
src/docker/conf/web.conf

@@ -7,7 +7,7 @@ port = 3309:3306
 volumes = {container}conf/db/mysql:/etc/mysql,/mysql/{name}/data:/var/lib/mysql
 environment = MYSQL_ROOT_PASSWORD=123456
 
-[php]
+[#php]
 port = 8082:8080
 link = [mysql]{num}:[mysql]{num}
 volumes_from = [mysql]{num}
@@ -16,6 +16,16 @@ volumes = {container}web:/www,{container}conf/web/php:/etc/php5
 # 容器里对宿主机提供的指令的别名,可以直接用php -i访问容器中的php命令了
 alias = php,composer
 
+[php]
+image = php7
+port = 8082:8080
+link = [mysql]{num}:[mysql]{num}
+volumes_from = [mysql]{num}
+volumes = {container}web:/www,{container}conf/web/php:/etc/php7
+#host = test:127.0.0.1,test1:127.0.0.1
+# 容器里对宿主机提供的指令的别名,可以直接用php -i访问容器中的php命令了
+alias = php,composer
+
 [nginx]
 port = 80:80,443:443
 link = [php]{num}:[php]{num}

+ 2 - 1
src/docker/core.conf

@@ -12,8 +12,9 @@ alpine_glibc		= os/alpine/glibc
 ;ubuntu				= os/ubuntu
 
 ;dev
-php					= dev/php
 php_base			= dev/php/base
+php					= dev/php
+php7				= dev/php/v7
 java				= dev/java
 java_base			= java/base
 maven				= java/maven