update lamp3

Author: whorusq

lamp3/README.md

@@ -11,6 +11,9 @@ lamp3（基于 Compose 管理的 LAMP 运行环境）
 
 ```bash
 $ docker-compose up
+
+# 或使用 --build 参数，对不存在的镜像进行编译
+$ docker-compose up --build
 ```
 
 ### 测试
@@ -47,3 +50,4 @@ $ docker-compose rm
 > 1. 如果 build 和 image 同时指定，在 docker-compose up 时会首先基于 Dockerfile 编译，并指定镜像名称为 image 参数指定的。
 > 2. 如果只指定 build，则编译后的镜像名称为`根目录+服务名`，如：lamp3_mysql
 > 3. 如果只指定 image，启动时则直接基于对应的本地镜像。
+

lamp3/docker-compose.yml

@@ -6,21 +6,26 @@
 version: '2'
 
 services:
+
   # PHP and Apache
   php_apache:
     build: ./php_apache
     image: lamp/php_apache
     ports:
       - "80:80"
-    links:
-      - mysql
     volumes:
       - ~/www:/var/www/html
+      - ./php_apache/conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ./php_apache/conf/apache/apache2.conf:/etc/apache2/apache2.conf
+      - ./php_apache/conf/apache/sites-available:/etc/apache2/sites-available
+      - ./php_apache/conf/apache/sites-enabled:/etc/apache2/sites-enabled
+
   # MySQL
   mysql:
-    build: ./mysql
+    build: ./mysql                                                                                                                
     image: lamp/mysql
     ports:
       - "3306:3306"
     volumes:
       - ~/data/mysql:/var/lib/mysql
+  

lamp3/mysql/Dockerfile

@@ -9,6 +9,12 @@ FROM mysql:5.6
 
 MAINTAINER whoru.S.Q <[email protected]>
 
+# 时区设置
+ENV TZ=Asia/Shanghai
+
 # 写权限
-RUN usermod -u 1000 mysql && chown mysql.mysql /var/run/mysqld/
+RUN /bin/cp /usr/share/zoneinfo/$TZ /etc/localtime \
+	&& echo $TZ > /etc/timezone \
+	&& usermod -u 1000 mysql \
+	&& chown mysql.mysql /var/run/mysqld/
 

lamp3/php_apache/Dockerfile

@@ -11,9 +11,14 @@ FROM php:5.6-apache
 
 MAINTAINER whoru.S.Q <[email protected]>
 
+# 时区设置
+ENV TZ=Asia/Shanghai
+
 # 安装其它扩展
 COPY ./source.list /etc/apt/sources.list
-RUN apt-get update \ 
+RUN /bin/cp /usr/share/zoneinfo/$TZ /etc/localtime \
+	&& echo $TZ > /etc/timezone \
+	&& apt-get update \ 
 	&& apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
@@ -31,16 +36,21 @@ RUN apt-get update \
 	# 或 ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load
 	&& a2enmod rewrite \
 
+	# 更改 web 根目录属主、属组，避免权限问题 
+	# 运行时用户可通过 phinfo() 中查看 APACHE_RUN_USER 获取
+	# usermod -u 1000 www-data && usermod -G staff www-data
+	#&& chown www-data:www-data /var/www/html \
+
 	# 清理
 	&& apt-get clean \
     && apt-get autoclean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
 
 # 追加 PHP 自定义配置文件
-COPY config/php.ini /usr/local/etc/php/
+#COPY config/php.ini /usr/local/etc/php/
 
 # 追加 Apache 自定义配置文件
-COPY ./config/apache2.conf /etc/apache2/apache2.conf
-COPY ./config/sites-available /etc/apache2/sites-available
-COPY ./config/sites-enabled /etc/apache2/sites-enabled
+#COPY ./config/apache2.conf /etc/apache2/apache2.conf
+#COPY ./config/sites-available /etc/apache2/sites-available
+#COPY ./config/sites-enabled /etc/apache2/sites-enabled
 

lamp3/php_apache/config/apache2.conf lamp3/php_apache/conf/apache/apache2.conf

@@ -2,13 +2,13 @@
 
 	ServerName dev.www 
 	DocumentRoot /var/www/html
-   
-	<Directory "/var/www/html">
-         AllowOverride All
-         options FollowSymLinks
-         Order allow,deny
-         Allow from all
-    </Directory>
+
+	<Directory "/var/www/html/debao">
+		AllowOverride All
+		options FollowSymLinks
+		# Order allow,deny
+		# Allow from all
+	</Directory>	   
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined

lamp3/php_apache/config/sites-available/default-ssl.conf lamp3/php_apache/conf/apache/sites-available/default-ssl.conf

@@ -2,7 +2,7 @@
 date.timezone = "Asia/Shanghai"
 memory_limit = 128m
 upload_max_filesize = 16m
-post_max_size = 8000M
+post_max_size = 9000M
 max_execution_time = 600
 max_input_time = 600
 memory_limit = 128m