Browse code

Updated README.md to prepare for docs merge

dhrp authored on 2013/03/26 10:46:13
Showing 1 changed files
... ...
@@ -8,11 +8,8 @@ Docker is a great building block for automating distributed systems: large-scale
8 8
 <img src="http://bricks.argz.com/bricksfiles/lego/07000/7823/012.jpg"/>
9 9
 
10 10
 * *Heterogeneous payloads*: any combination of binaries, libraries, configuration files, scripts, virtualenvs, jars, gems, tarballs, you name it. No more juggling between domain-specific tools. Docker can deploy and run them all.
11
-
12 11
 * *Any server*: docker can run on any x64 machine with a modern linux kernel - whether it's a laptop, a bare metal server or a VM. This makes it perfect for multi-cloud deployments.
13
-
14 12
 * *Isolation*: docker isolates processes from each other and from the underlying host, using lightweight containers.
15
-
16 13
 * *Repeatability*: because containers are isolated in their own filesystem, they behave the same regardless of where, when, and alongside what they run.
17 14
 
18 15
 
... ...
@@ -20,21 +17,14 @@ Notable features
20 20
 -----------------
21 21
 
22 22
 * Filesystem isolation: each process container runs in a completely separate root filesystem.
23
-
24 23
 * Resource isolation: system resources like cpu and memory can be allocated differently to each process container, using cgroups.
25
-
26 24
 * Network isolation: each process container runs in its own network namespace, with a virtual interface and IP address of its own.
27
-
28 25
 * Copy-on-write: root filesystems are created using copy-on-write, which makes deployment extremeley fast, memory-cheap and disk-cheap.
29
-
30 26
 * Logging: the standard streams (stdout/stderr/stdin) of each process container are collected and logged for real-time or batch retrieval.
31
-
32 27
 * Change management: changes to a container's filesystem can be committed into a new image and re-used to create more containers. No templating or manual configuration required.
33
-
34 28
 * Interactive shell: docker can allocate a pseudo-tty and attach to the standard input of any container, for example to run a throwaway interactive shell.
35 29
 
36 30
 
37
-
38 31
 Under the hood
39 32
 --------------
40 33
 
... ...
@@ -42,11 +32,8 @@ Under the hood, Docker is built on the following components:
42 42
 
43 43
 
44 44
 * The [cgroup](http://blog.dotcloud.com/kernel-secrets-from-the-paas-garage-part-24-c) and [namespacing](http://blog.dotcloud.com/under-the-hood-linux-kernels-on-dotcloud-part) capabilities of the Linux kernel;
45
-
46 45
 * [AUFS](http://aufs.sourceforge.net/aufs.html), a powerful union filesystem with copy-on-write capabilities;
47
-
48 46
 * The [Go](http://golang.org) programming language;
49
-
50 47
 * [lxc](http://lxc.sourceforge.net/), a set of convenience scripts to simplify the creation of linux containers.
51 48
 
52 49
 
... ...
@@ -91,37 +78,7 @@ Right now, the officially supported distributions are:
91 91
 
92 92
 Docker probably works on other distributions featuring a recent kernel, the AUFS patch, and up-to-date lxc. However this has not been tested.
93 93
 
94
-Installing with Vagrant
95
-
96
-Currently, Docker can be installed with Vagrant both on your localhost
97
-with VirtualBox as well as on Amazon EC2. Vagrant 1.1 is required for
98
-EC2, but deploying is as simple as:
99
-
100
-```bash
101
-$ export AWS_ACCESS_KEY_ID=xxx \
102
-	AWS_SECRET_ACCESS_KEY=xxx \
103
-	AWS_KEYPAIR_NAME=xxx \
104
-	AWS_SSH_PRIVKEY=xxx
105
-$ vagrant plugin install vagrant-aws
106
-$ vagrant up --provider=aws
107
-```
108
-
109
-The environment variables are:
110
-
111
-* `AWS_ACCESS_KEY_ID` - The API key used to make requests to AWS
112
-* `AWS_SECRET_ACCESS_KEY` - The secret key to make AWS API requests
113
-* `AWS_KEYPAIR_NAME` - The name of the keypair used for this EC2 instance
114
-* `AWS_SSH_PRIVKEY` - The path to the private key for the named keypair
115
-
116
-For VirtualBox, you can simply ignore setting any of the environment
117
-variables and omit the `provider` flag. VirtualBox is still supported with
118
-Vagrant &lt;= 1.1:
119
-
120
-```bash
121
-$ vagrant up
122
-```
123
-
94
+Some streamlined (but possibly outdated) installation paths' are available from the website: http://docker.io/documentation/ 
124 95
 
125 96
 
126 97
 Usage examples
... ...
@@ -186,154 +143,18 @@ echo "Daemon received: $(docker logs $JOB)"
186 186
 Contributing to Docker
187 187
 ======================
188 188
 
189
-Want to hack on Docker? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.
190
-
191
-Contribution guidelines
192
-
193
-### Pull requests are always welcome
194
-
195
-We are always thrilled to receive pull requests, and do our best to process them as fast as possible. Not sure if that typo is worth a pull request? Do it! We will appreciate it.
196
-
197
-If your pull request is not accepted on the first try, don't be discouraged! If there's a problem with the implementation, hopefully you received feedback on what to improve.
198
-
199
-We're trying very hard to keep Docker lean and focused. We don't want it to do everything for everybody. This means that we might decide against incorporating a new feature.
200
-However, there might be a way to implement that feature *on top of* docker.
201
-
202
-### Discuss your design on the mailing list
203
-
204
-We recommend discussing your plans [on the mailing list](https://groups.google.com/forum/?fromgroups#!forum/docker-club) before starting to code - especially for more ambitious contributions. This gives other contributors a chance to point
205
-you in the right direction, give feedback on your design, and maybe point out if someone else is working on the same thing.
206
-
207
-### Create issues...
208
-
209
-Any significant improvement should be documented as [a github issue](https://github.com/dotcloud/docker/issues) before anybody starts working on it.
210
-
211
-### ...but check for existing issues first!
212
-
213
-Please take a moment to check that an issue doesn't already exist documenting your bug report or improvement proposal.
214
-If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
215
-
216
-
217
-### Write tests
218
-
219
-Golang has a great testing suite built in: use it! Take a look at existing tests for inspiration.
220
-
221
-
222
-
223
-Setting up a dev environment
224
-
225
-Instructions that have been verified to work on Ubuntu 12.10,
226
-
227
-```bash
228
-sudo apt-get -y install lxc wget bsdtar curl golang git
229
-
230
-export GOPATH=~/go/
231
-export PATH=$GOPATH/bin:$PATH
232
-
233
-mkdir -p $GOPATH/src/github.com/dotcloud
234
-cd $GOPATH/src/github.com/dotcloud
235
-git clone git@github.com:dotcloud/docker.git
236
-cd docker
237
-
238
-go get -v github.com/dotcloud/docker/...
239
-go install -v github.com/dotcloud/docker/...
240
-```
241
-
242
-Then run the docker daemon,
243
-
244
-```bash
245
-sudo $GOPATH/bin/docker -d
246
-```
247
-
248
-Run the `go install` command (above) to recompile docker.
249
-
250
-
251
-What is a Standard Container?
252
-=============================
253
-
254
-Docker defines a unit of software delivery called a Standard Container. The goal of a Standard Container is to encapsulate a software component and all its dependencies in
255
-a format that is self-describing and portable, so that any compliant runtime can run it without extra dependencies, regardless of the underlying machine and the contents of the container.
256
-
257
-The spec for Standard Containers is currently a work in progress, but it is very straightforward. It mostly defines 1) an image format, 2) a set of standard operations, and 3) an execution environment.
258
-
259
-A great analogy for this is the shipping container. Just like Standard Containers are a fundamental unit of software delivery, shipping containers (http://bricks.argz.com/ins/7823-1/12) are a fundamental unit of physical delivery.
260
-
261
-### 1. STANDARD OPERATIONS
262
-
263
-Just like shipping containers, Standard Containers define a set of STANDARD OPERATIONS. Shipping containers can be lifted, stacked, locked, loaded, unloaded and labelled. Similarly, standard containers can be started, stopped, copied, snapshotted, downloaded, uploaded and tagged.
264
-
265
-
266
-### 2. CONTENT-AGNOSTIC
267
-
268
-Just like shipping containers, Standard Containers are CONTENT-AGNOSTIC: all standard operations have the same effect regardless of the contents. A shipping container will be stacked in exactly the same way whether it contains Vietnamese powder coffee or spare Maserati parts. Similarly, Standard Containers are started or uploaded in the same way whether they contain a postgres database, a php application with its dependencies and application server, or Java build artifacts.
269
-
270
-
271
-### 3. INFRASTRUCTURE-AGNOSTIC
272
-
273
-Both types of containers are INFRASTRUCTURE-AGNOSTIC: they can be transported to thousands of facilities around the world, and manipulated by a wide variety of equipment. A shipping container can be packed in a factory in Ukraine, transported by truck to the nearest routing center, stacked onto a train, loaded into a German boat by an Australian-built crane, stored in a warehouse at a US facility, etc. Similarly, a standard container can be bundled on my laptop, uploaded to S3, downloaded, run and snapshotted by a build server at Equinix in Virginia, uploaded to 10 staging servers in a home-made Openstack cluster, then sent to 30 production instances across 3 EC2 regions.
274
-
275
-
276
-### 4. DESIGNED FOR AUTOMATION
277
-
278
-Because they offer the same standard operations regardless of content and infrastructure, Standard Containers, just like their physical counterpart, are extremely well-suited for automation. In fact, you could say automation is their secret weapon.
279
-
280
-Many things that once required time-consuming and error-prone human effort can now be programmed. Before shipping containers, a bag of powder coffee was hauled, dragged, dropped, rolled and stacked by 10 different people in 10 different locations by the time it reached its destination. 1 out of 50 disappeared. 1 out of 20 was damaged. The process was slow, inefficient and cost a fortune - and was entirely different depending on the facility and the type of goods.
281
-
282
-Similarly, before Standard Containers, by the time a software component ran in production, it had been individually built, configured, bundled, documented, patched, vendored, templated, tweaked and instrumented by 10 different people on 10 different computers. Builds failed, libraries conflicted, mirrors crashed, post-it notes were lost, logs were misplaced, cluster updates were half-broken. The process was slow, inefficient and cost a fortune - and was entirely different depending on the language and infrastructure provider.
283
-
284
-
285
-### 5. INDUSTRIAL-GRADE DELIVERY
286
-
287
-There are 17 million shipping containers in existence, packed with every physical good imaginable. Every single one of them can be loaded on the same boats, by the same cranes, in the same facilities, and sent anywhere in the World with incredible efficiency. It is embarrassing to think that a 30 ton shipment of coffee can safely travel half-way across the World in *less time* than it takes a software team to deliver its code from one datacenter to another sitting 10 miles away.
288
-
289
-With Standard Containers we can put an end to that embarrassment, by making INDUSTRIAL-GRADE DELIVERY of software a reality.
290
-
291
-
292
-
293
-
294
-Standard Container Specification
295
-
296
-(TODO)
297
-
298
-### Image format
299
-
300
-
301
-### Standard operations
302
-
303
-* Copy
304
-* Run
305
-* Stop
306
-* Wait
307
-* Commit
308
-* Attach standard streams
309
-* List filesystem changes
310
-* ...
311
-
312
-### Execution environment
313
-
314
-#### Root filesystem
315
-
316
-#### Environment variables
317
-
318
-#### Process arguments
319
-
320
-#### Networking
321
-
322
-#### Process namespacing
189
+Want to hack on Docker? Awesome! There are instructions to get you started on the website: http://docker.io/documentation/contributing/contributing.html 
323 190
 
324
-#### Resource limits
191
+They are probably not perfect, please let us know if anything feels wrong or incomplete.
325 192
 
326
-#### Process monitoring
327 193
 
328
-#### Logging
194
+Note
195
+----
329 196
 
330
-#### Signals
197
+We also keep the documentation in this repository. The website documentation is generated using sphinx using these sources.
198
+Please find it under docs/sources/ and read more about it https://github.com/dotcloud/docker/master/docs/README.md
331 199
 
332
-#### Pseudo-terminal allocation
200
+Please feel free to fix / update the documentation and send us pull requests. More tutorials are also welcome.
333 201
 
334
-#### Security
335 202
 
336 203