Commit Graph
96 Commits
Author SHA1 Message Date
Baohua YangandGitHub 93c1947770 Merge pull request #306 from khs1994/master
Release v0.9.0
2017-12-31 21:10:11 +08:00
Baohua YangandGitHub d230ecfe1f Merge pull request #300 from khs1994/master
Update content
2017-12-25 21:12:58 +08:00
Baohua YangandGitHub 35b144058c Merge pull request #299 from khs1994/master
Update mesos/framework.md
2017-12-20 21:37:17 +08:00
Baohua YangandGitHub 800f33a266 Merge pull request #297 from khs1994/master
User docker exec to enter container
2017-12-18 16:44:42 +08:00
Baohua YangandGitHub 346da872f9 Merge pull request #296 from khs1994/master 2017-12-17 13:39:32 +08:00
Baohua YangandGitHub a866b5950e Merge pull request #292 from khs1994/master 2017-12-13 10:44:19 +08:00
Baohua YangandGitHub aeed2026ea Merge pull request #291 from khs1994/master 2017-12-10 15:09:26 +08:00
Baohua YangandGitHub 503b73895d Merge pull request #290 from khs1994/master
Release v0.9-rc2: remove unused files
2017-12-09 20:05:20 +08:00
Baohua YangandGitHub e88f293eb4 Merge pull request #286 from khs1994/master
Update content
2017-12-08 22:33:58 +08:00
Baohua YangandGitHub d95fcea6df Fix MacOS to macOS 2017-12-08 18:58:19 +08:00
Baohua YangandGitHub 26c8f243ee Update ISSUE_TEMPLATE.md 2017-12-07 10:18:24 +08:00
Baohua YangandGitHub d364cc4565 Merge pull request #284 from khs1994/master
Update network usage and revise changelog and contributing docs
2017-12-05 16:40:41 +08:00
Baohua YangandGitHub e5267d3754 Merge pull request #281 from khs1994/master
Update container image chapter
2017-12-05 10:19:08 +08:00
Baohua YangandGitHub e0f501b0eb Merge pull request #280 from khs1994/master
Fix #278: Update SUMMARY
2017-12-05 09:48:34 +08:00
Baohua YangandGitHub 414546cc85 Merge pull request #277 from khs1994/master 2017-12-04 20:36:38 +08:00
Baohua YangandGitHub b5ad19eac8 Merge pull request #274 from khs1994/master 2017-12-03 23:02:12 +08:00
Baohua YangandGitHub 7c54647512 Merge pull request #273 from khs1994/master 2017-12-02 08:12:05 +08:00
Baohua YangandGitHub 421c0b55e3 Merge pull request #272 from khs1994/master
Fix #270: docker daemon deprecated
2017-12-01 22:35:12 +08:00
Baohua YangandGitHub 9a403a5e7d Merge pull request #271 from khs1994/master
Update k8s content
2017-12-01 17:29:23 +08:00
Baohua YangandGitHub ce228cf0ae Merge pull request #269 from khs1994/master
Update registry
2017-12-01 16:43:19 +08:00
Baohua YangandGitHub 9c8e8429af Add using issue 2017-11-30 23:06:37 +08:00
Baohua YangandGitHub ca1ebd12f3 Add step for reviewing 2017-11-30 22:03:03 +08:00
Baohua YangandGitHub d8b30bc3de Simplify content 2017-11-25 14:17:45 +08:00
Baohua YangandGitHub 2e1edc8985 Merge pull request #239 from yeasy/dev 2017-11-23 18:22:15 +08:00
Baohua YangandGitHub eb32acd810 Merge pull request #219 from khs1994/master
Fix #216 #218
2017-11-22 09:29:16 +08:00
Baohua YangandGitHub 1278ea8260 Merge pull request #212 from khs1994/master
Fix code grammar indicator, update help docs
2017-11-14 11:16:53 +08:00
Baohua YangandGitHub cfcc278b86 Merge pull request #211 from khs1994/master
Update with latest content
2017-11-12 22:41:53 +08:00
Baohua YangandGitHub 7198e22549 Merge pull request #204 from khs1994/master
Fix #203 #206 #208 #209
2017-10-31 19:11:08 -05:00
Baohua YangandGitHub 933da93481 Merge pull request #205 from LetianFeng/master
Fix typo: Dockrfile -> Dockerfile
2017-10-20 07:52:46 -05:00
Baohua YangandGitHub 7d5b893af7 Merge pull request #202 from khs1994/master
Fix links
2017-09-16 10:49:07 +08:00
Baohua Yang 1bfc58ebd7 Set theme jekyll-theme-slate 2017-09-11 15:44:34 +08:00
Baohua YangandGitHub b72dc44d7b Merge pull request #199 from khs1994/master
Fix #186: Refine installation
2017-09-05 22:00:31 +08:00
Baohua YangandGitHub cd7873ba60 Merge pull request #198 from yeasy/revert-195-master
Revert "fix #186"
2017-09-04 19:31:33 +08:00
Baohua YangandGitHub 66dd70e5db Revert "fix #186" 2017-09-04 19:31:17 +08:00
Baohua YangandGitHub 2070dc8bce Merge pull request #195 from khs1994-gitbook/master
Fix #186 and #195
2017-09-04 14:57:52 +08:00
Baohua YangandGitHub 0f883b44a4 Merge pull request #194 from khs1994/master
UPDATE install with adding more os types
2017-09-04 14:54:19 +08:00
Baohua YangandGitHub d8b2a7a303 Remove failed qq group number 2017-09-01 11:28:04 +08:00
Baohua YangandGitHub 41779a5661 Merge pull request #188 from pkking/master
Add new registry mirror from official site
2017-08-21 16:58:07 +08:00
Baohua YangandGitHub 62f9976b0d Merge pull request #187 from silenceper/master
Fix consul name
2017-08-16 13:49:04 +08:00
Baohua YangandGitHub f59dd5bdc0 Merge pull request #184 from liu4480/master
Update docker-registry repo
2017-07-28 14:13:21 +08:00
Baohua YangandGitHub f7e6d648f5 Merge pull request #183 from wzcboss/master
Remove ";" in python code
2017-07-25 10:38:38 +08:00
Baohua YangandGitHub de972a0404 Merge pull request #179 from alex8866/master
Update tencent cloud introduction
2017-07-18 20:53:59 +08:00
Baohua YangandGitHub 91e53f489a Merge pull request #138 from rockcitystore/master
Fix docker registry path to 2.0 by default
2017-07-18 14:27:28 +08:00
Baohua YangandGitHub f1a9e3372c Merge pull request #182 from leotian/fix-img
Fix missing image
2017-07-17 23:10:48 +08:00
Baohua YangandGitHub 62c03c1c53 Merge pull request #177 from wenfengshi/master
Fix typo and broken links
2017-06-18 14:59:13 +08:00
Baohua YangandGitHub 705fb2efc3 Merge pull request #175 from shuizhongyueming/f/RUN命令调整
Fix run cmd
2017-06-01 18:50:13 +08:00
Baohua YangandGitHub 2568854736 Merge pull request #171 from glixingxian/master
Improve nsenter example
2017-05-02 11:31:51 +08:00
Baohua YangandGitHub 4ca37a0de7 Merge pull request #170 from shuizhongyueming/master
Update using mirror at MacOS
2017-04-29 22:46:46 +08:00
Baohua YangandGitHub 1bfd80b970 Merge pull request #167 from aleen42/patch-1
Add a plugin `page-treeview`
2017-04-24 16:49:30 +08:00
Baohua YangandGitHub e87ff1bb1e Merge pull request #165 from wg1j/master
Fixed url and add footnote to new Docker Store
2017-04-24 10:32:11 +08:00
Baohua YangandGitHub 60ebacfda4 Merge pull request #163 from shijinzhan/patch-1
Add space before title
2017-03-15 11:36:04 +08:00
Baohua YangandGitHub 2a39cf4ce8 Merge pull request #162 from stenote/patch-1
Update WORKDIR usage
2017-03-14 20:47:39 +08:00
Baohua YangandGitHub 17add1cda4 Merge pull request #161 from Howld/master
Fix typos
2017-03-03 11:29:39 +08:00
Baohua YangandGitHub 86523b981e Merge pull request #158 from 374632897/master
Fix typos
2017-02-19 16:08:12 +08:00
Baohua YangandGitHub 12ddbfda1e Merge pull request #157 from twang2218/fix-basic-concept-typo
Fix basic concept chapter's typo, make it clearer
2017-02-16 14:50:48 +08:00
Baohua YangandGitHub e003739d1a Merge pull request #155 from gerryke/master
Fix typo
2017-02-10 21:32:17 +08:00
Baohua YangandGitHub 3344b31dcc Merge pull request #154 from mzeht/master
Fix format
2017-02-07 22:15:49 +08:00
Baohua YangandGitHub 7726d62b7a Merge pull request #150 from qiuyin/master
Update volume.md
2017-01-26 15:32:06 +08:00
Baohua YangandGitHub 8291e13c27 Merge pull request #149 from qiuyin/master
Update volume, will need more explicit change point info
2017-01-25 20:10:17 +08:00
Baohua YangandGitHub a3bec5ffba Merge pull request #148 from hkKimWu/master
Fix missing comma
2017-01-13 17:07:31 +08:00
Baohua YangandGitHub 60388ba6e9 Merge pull request #147 from QwertyJack/master
Fix typo
2017-01-11 17:44:36 +08:00
Baohua YangandGitHub dd33dea8e4 Merge pull request #146 from JohannLai/master
Fix “Web” to "web",consistent with sub directories
2017-01-06 22:43:35 +08:00
Baohua YangandGitHub 2226d748e3 Merge pull request #145 from twang2218/install-mac
Add Homebrew Cask install method to install/mac.md
2016-12-20 09:56:09 +08:00
Baohua YangandGitHub 3d66f42043 Merge pull request #144 from hzwangsiyu/master
Fix typo
2016-12-20 09:55:18 +08:00
Baohua YangandGitHub a46012033f Merge pull request #141 from xiaoxing598/master
Change term of "internal"
2016-12-15 16:44:50 +08:00
Baohua YangandGitHub ecc493ac96 Merge pull request #140 from chenshenyou/master
Fix issue #139: fix typo, change from 意外 to 以外
2016-12-15 16:44:01 +08:00
Baohua YangandGitHub e537012881 Merge pull request #137 from twang2218/update-dockerfile-arg
Add --build-arg doc on Docker 1.13
2016-11-28 11:29:24 +08:00
Baohua YangandGitHub 590b0bea31 Merge pull request #135 from twang2218/image-remove
Refine the image remove chapter
2016-11-28 11:25:22 +08:00
Baohua YangandGitHub 5230300d30 Merge pull request #132 from twang2218/image-create
Fix image link
2016-11-27 10:39:29 +08:00
Baohua YangandGitHub fa3c55840c Merge pull request #133 from twang2218/fix-issue-131-github-buttons-problem
Fix #8 hide the github button when it's in mobile
2016-11-27 10:37:44 +08:00
Baohua YangandGitHub 710956aed5 Merge pull request #129 from twang2218/install-mac
Use more explicit figure to show registry mirror preference
2016-11-26 18:04:53 +08:00
Baohua YangandGitHub 66b81709e7 Merge pull request #128 from twang2218/image-create
Add more content on image creation
2016-11-26 18:03:54 +08:00
Baohua YangandGitHub 5385a8b0dc Merge pull request #127 from twang2218/update-book-json
Update book.json
2016-11-23 16:44:45 +08:00
Baohua YangandGitHub ff5eb9d96a Merge pull request #126 from sugov5/master
Add how to use registry mirror on Win 10
2016-11-18 13:18:53 +08:00
Baohua YangandGitHub efb0afd0d9 Update minor version number 2016-11-15 14:30:38 +08:00
Baohua YangandGitHub e84a08c4f2 Merge pull request #123 from twang2218/image-list
Add more details on image operations
2016-11-15 14:29:37 +08:00
Baohua YangandGitHub d816cd15ad Merge pull request #124 from twang2218/install-mac
Add missing figures
2016-11-15 14:28:44 +08:00
Baohua YangandGitHub 48bf98a77b Merge pull request #125 from twang2218/namespace
Refine the term of 'namespace'
2016-11-15 14:28:24 +08:00
Baohua YangandGitHub 3e0c0c6ef6 Merge pull request #121 from twang2218/install-merge
Merge installation steps on Ubuntu and Debian
2016-11-13 23:03:15 +08:00
Baohua YangandGitHub 20d632465b Merge pull request #122 from twang2218/install-mirror
Add more refs to registry mirror
2016-11-13 23:02:15 +08:00
Baohua YangandGitHub f1b622ebfd Update pull.md 2016-11-13 23:01:49 +08:00
Baohua YangandGitHub 28cfc39b9c Update repository.md 2016-11-13 23:01:25 +08:00
Baohua YangandGitHub a119a30fa5 Merge pull request #118 from twang2218/image-pull
Refine image pull chapter
2016-11-13 09:01:29 +08:00
Baohua YangandGitHub 3f0b68c21d Update mirror.md 2016-11-13 08:55:29 +08:00
Baohua YangandGitHub 6c60ad459c Merge pull request #119 from twang2218/install-mac
Add installation on MacOS
2016-11-13 08:54:10 +08:00
Baohua YangandGitHub 6fd3097bd9 Merge pull request #117 from twang2218/sh-to-bash
Use bash in grammar marker instead of sh for better compatibility.
2016-11-11 10:23:39 +08:00
Baohua YangandGitHub d8be8f15a9 Merge pull request #116 from twang2218/install-centos
Refine Docker installation on CentOS
2016-11-10 17:39:23 +08:00
Baohua YangandGitHub c5ac987475 Merge pull request #115 from twang2218/install-debian
Refine the installation on Debian
2016-11-10 17:38:54 +08:00
Baohua YangandGitHub 65a1e69462 Merge pull request #114 from WALL-E/fix/nsenter
Update new version nsenter cmd
2016-11-09 22:02:16 +08:00
Baohua YangandGitHub 5b03c5d974 Merge pull request #112 from twang2218/install-ubuntu
Refine installation on Ubuntu
2016-11-09 11:23:37 +08:00
Baohua YangandGitHub c4028b0016 Merge pull request #110 from twang2218/basic_concept
Refine the basic concept part
2016-11-08 11:17:02 +08:00
Baohua YangandGitHub 46be5458ef Merge pull request #109 from twang2218/introduction-why
Add more content on why adopt Docker
2016-11-07 10:51:17 +08:00
Baohua YangandGitHub bf3100e68f Merge pull request #108 from twang2218/introduction-what
Add more info on Docker startup
2016-11-06 18:43:24 +08:00
Baohua YangandGitHub 57e97c6375 Fix ref link to wiki 2016-11-06 18:42:34 +08:00
Baohua YangandGitHub 4fdbb1ee33 Merge pull request #107 from WALL-E/fix/swarm
Fix typo
2016-10-27 15:02:04 +08:00
Baohua YangandGitHub 8437b4fd1f Merge pull request #106 from WALL-E/fix/compose
Fix  haproxy config in compose usage example
2016-10-25 17:26:48 +08:00