centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 07:18:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,990 Commits 54 Branches 28 Tags
5ea8dc376c94de6939e35a4152b1a9a5979911dd
Commit Graph

3465 Commits

Author SHA1 Message Date
Alexander Morozov
3dc07162bd Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
 2015-04-22 17:20:10 -07:00
Sven Dowideit
b6702116be Merge pull request #12615 from moxiegirl/update-repository-links 
Fixing a few links in registry
 2015-04-23 10:02:02 +10:00
Sven Dowideit
84a9962a63 Merge pull request #12614 from ankushagarwal/ubuntu-docs 
Add Configuring Docker article
 2015-04-23 09:41:11 +10:00
Sven Dowideit
ce7e1a4d7e Merge pull request #12586 from ankushagarwal/image-digests 
Add Image Digest doc in userguide/dockerimages
 2015-04-23 09:23:23 +10:00
Sven Dowideit
b2aca01d95 Merge pull request #12513 from allingeek/patch-1 
builder.md - Changes to bring LABEL docs in line with 1.6 release.
 2015-04-23 08:58:59 +10:00
Dan Walsh
b88b2fa72e Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-22 17:37:26 -04:00
Ankush Agarwal
9689aab5ec Update with @moxiegirl's patch and add direct config 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-22 10:36:38 -07:00
Mary Anthony
54ff1dcb82 Fixing a few links in registry 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-21 18:36:37 -07:00
Ankush Agarwal
9424fc14bb Add Configuring Docker article [WIP] 
Fixes #12088

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-21 17:49:29 -07:00
Mary Anthony
bc7a43cb44 Putting into our new format for cloud 
Adding in Seb's comments
Updating with Fred's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-21 14:48:48 -07:00
Fred Lifton
21c8d211e1 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc 
Remove some unsupported instructions in the docs.
 2015-04-21 14:08:31 -07:00
Ankush Agarwal
a4676503d9 Add Image Digest doc in userguide/dockerimages 
Fixes #12551

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-21 12:47:09 -07:00
Dan Walsh
364287b741 Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-21 12:57:54 -04:00
James Turnbull
afd5636461 Merge pull request #12563 from kentoj/patch-1 
Clarify data volume init with existing data
 2015-04-21 08:57:22 -07:00
Jessie Frazelle
17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Arnaud Porterie
9838242db1 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
 2015-04-20 15:50:35 -07:00
Mary Anthony
1f4ef5192c Adding in 1.60 release notes 
Updating with thaJetzah's comments
Adding in Fred's copy edits

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-20 13:31:22 -07:00
Kent Johnson
ff9f0134ae Clarify data volume init with existing data 
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.

Signed-off-by: Kent Johnson <kentoj@gmail.com>
 2015-04-20 14:24:40 -06:00
moxiegirl
f85eb4baad Merge pull request #12414 from draghuram/projectdoc 
Improve documentation in "project" directory.
 2015-04-20 13:16:20 -07:00
Doug Davis
18c9b6c645 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-20 13:05:24 -07:00
Raghuram Devarakonda
fcdb1fbfa1 Improve documentation in "project" directory. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-20 13:08:13 -04:00
Lei Jitang
dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Sylvain Baubeau
acb6127c1a Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
 2015-04-20 15:13:30 +02:00
Shijiang Wei
49be84842e Remove some unsupported instructions in the docs. 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-04-20 16:48:17 +08:00
moxiegirl
2e58350bd6 Merge pull request #12518 from moxiegirl/fix-12516-registry-doc 
Docker Registry Server > Docker Registry
 2015-04-19 07:14:09 -07:00
moxiegirl
547ded5df7 Merge pull request #12512 from ankushagarwal/document-binaries 
Document the download location of Linux, Windows and Mac OS X binaries
 2015-04-19 07:12:45 -07:00
Ankush Agarwal
99251f60c2 Document the download location of binaries 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-04-19 01:51:03 -07:00
Mary Anthony
7b2b7df386 Docker Registry Server > Docker Registry 
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-18 19:19:48 -07:00
Jeff Nickoloff
89df65be5d Update builder.md 
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
 2015-04-18 11:38:20 -07:00
Jörg Thalheim
bbe6df1288 docs: speed up build by reducing build steps 
- should be also easier to maintain

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-04-18 13:28:52 +02:00
Mary Anthony
3a88367241 Updates to Compose docs and ENV vars 
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-17 13:08:57 -07:00
moxiegirl
4492977437 Merge pull request #12484 from superseb/12367-jessie-instructions 
Added Debian 8 note for adding backports
 2015-04-17 10:16:53 -07:00
moxiegirl
ced638094f Merge pull request #12470 from zembutsu/patch-1 
fix typo
 2015-04-17 09:55:56 -07:00
Sebastiaan van Steenis
37b9ce61ac Added Debian 8 note for adding backports 
Signed-off-by: Sebastiaan van Steenis <mail@superseb.nl>
 2015-04-17 16:32:28 +02:00
Masahito Zembutsu
3cdf94ed1a fix typo 
Is this typo?

Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
 2015-04-17 16:06:54 +09:00
Qiang Huang
01548ed1dc update docker-inspect man page 
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-17 09:25:06 +08:00
moxiegirl
24af878358 Merge pull request #12455 from bfirsh/remove-registry-redirect 
Remove registry redirect
 2015-04-16 17:55:02 -07:00
moxiegirl
b8530c6c5e Merge pull request #12383 from jdivock/patch-1 2015-04-16 14:45:36 -07:00
moxiegirl
2ba1244ad2 Merge pull request #12452 from moxiegirl/release-versions-set 
Updating with final version from Stephen
 2015-04-16 14:31:45 -07:00
moxiegirl
96b5a3f562 Merge pull request #12411 from sbasyal/patch-2 
The link to issue 407 was broken
 2015-04-16 13:32:02 -07:00
Ben Firshman
4c6d5e3a25 Remove registry redirect 
... it was causing an infinite redirect.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-04-16 12:54:56 -07:00
Mary Anthony
b4b21ff0a6 Updating with final version from Stephen 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-16 11:40:36 -07:00
Mary Anthony
f44aa3b1fb for 1.6 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-16 11:33:49 -07:00
Arnaud Porterie
ae5cf30c7c Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 08:38:18 -07:00
Mary Anthony
fe8fb24b53 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-15 19:02:01 -07:00
Sabin Basyal
6860c75b7b The link to issue 407 was broken 
The link to issue 407 was broken. The old link was: https://github.com/docker/docker/issues/407%20kernel%20versions
The link must be: https://github.com/docker/docker/issues/407

Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
 2015-04-15 14:06:11 -07:00
Brian Goff
f0c60f7085 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
 2015-04-15 14:28:39 -04:00
moxiegirl
2499baefdd Merge pull request #12399 from emirozer/master 
closes #8945
 2015-04-15 10:53:10 -07:00
Emir Ozer
960de9c8dd closes #8945 
Signed-off-by: Emir Ozer <emirozer@yandex.com>
 2015-04-15 15:31:23 +02:00