Merge branch 'master' of github.com:yeasy/docker_practice

appendix/repo/centos.md

@@ -56,3 +56,5 @@ LABEL name="CentOS Base Image" \
 
 CMD ["/bin/bash"]
 ```
+
+

appendix/repo/mongodb.md

@@ -261,3 +261,4 @@ ENTRYPOINT ["/entrypoint.sh"]
 EXPOSE 27017
 CMD ["mongod"]
 ```
+

appendix/repo/mysql.md

@@ -122,3 +122,5 @@ ENTRYPOINT ["/entrypoint.sh"]
 EXPOSE 3306
 CMD ["mysqld", "--datadir=/var/lib/mysql", "--user=mysql"]
 ```
+
+

appendix/repo/nginx.md

@@ -99,3 +99,5 @@ EXPOSE 80 443
 
 CMD ["nginx", "-g", "daemon off;"]
 ```
+
+

appendix/repo/redis.md

@@ -139,3 +139,5 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 EXPOSE 6379
 CMD [ "redis-server" ]
 ```
+
+

appendix/repo/ubuntu.md

@@ -140,3 +140,5 @@ RUN sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
 # overwrite this with 'CMD []' in a dependent Dockerfile
 CMD ["/bin/bash"]
 ```
+
+

appendix/repo/wordpress.md

@@ -115,3 +115,4 @@ COPY docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
 ```
+

data_management/volume.md

@@ -56,6 +56,21 @@ $ docker inspect web
 }
 ...
 ```
+注：从Docker 1.8.0起，数据卷配置在"Mounts"Key下面，可以看到所有的数据卷都是创建在主机的`/mnt/sda1/var/lib/docker/volumes/....`下面了。
+```
+"Mounts": [
+            {
+                "Name": "b53ebd40054dae599faf7c9666acfe205c3e922fc3e8bc3f2fd178ed788f1c29",
+                "Source": "/mnt/sda1/var/lib/docker/volumes/b53ebd40054dae599faf7c9666acfe205c3e922fc3e8bc3f2fd178ed788f1c29/_data",
+                "Destination": "/webapp",
+                "Driver": "local",
+                "Mode": "",
+                "RW": true,
+                "Propagation": ""
+            }
+        ]
+...
+```
 
 ### 挂载一个本地主机文件作为数据卷
 `-v` 标记也可以从主机挂载单个文件到容器中

image/dockerfile/cmd.md

@@ -45,5 +45,5 @@ CMD service nginx start
 正确的做法是直接执行 `nginx` 可执行文件，并且要求以前台形式运行。比如：
 
 ```Dockerfile
-CMD ["nginx" "-g" "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]
 ```