clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,036 Commits 9 Branches 112 Tags
7d4bbc2ed8305a730267e861bfe71ac7dbd3e373
Commit Graph
2964 Commits
Author SHA1 Message Date
Michael Crosby 7d4bbc2ed8 Merge pull request #10273 from kojiromike/patch-1 
Distinguish ENV from setting environment inline
 2015-02-06 14:42:02 -08:00
Michael Crosby e4a49ae188 Merge pull request #10424 from LK4D4/fix_non_tailed_log_format 
Fix logs, so now, old and followed logs has same format without []
 2015-02-06 14:35:45 -08:00
Alexander Morozov 0f8f04a774 Fix example about ps and linked containers 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 14:05:08 -08:00
Tibor Vass 2e947ae407 Merge pull request #10605 from glasnt/readme_format 
Format `awsconfig` sample config correctly
 2015-02-06 16:55:58 -05:00
Tibor Vass 9c63178e86 Merge pull request #10611 from unclejack/systemd_doc_storage_path 
docs/articles/systemd: correct --storage-driver
 2015-02-06 16:52:28 -05:00
Michael Crosby d1f18786ac Merge pull request #10263 from hqhq/hq_check_memoryswap 
add check for memoryswap
 2015-02-06 13:43:23 -08:00
Sven Dowideit 6081a3ca90 Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs 
The reference menu is too big to list more than the latest API docs, so ...
 2015-02-06 19:26:01 +10:00
unclejack 0b2f734462 docs/articles/systemd: correct --storage-driver 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-02-06 10:52:09 +02:00
Katie McLaughlin df39336213 Format awsconfig sample config correctly 
Reflow change in commit 195f3a3f removed newlines in the config format.

This change reverts the sample config to the original formatting, which
matches the actual config format of a `awsconfig` file.

Signed-off-by: Katie McLaughlin <katie@glasnt.com>
 2015-02-06 13:45:10 +11:00
Fred Lifton 68b0ed54cb Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer 
For now, docker stats appears to be libcontainer only
 2015-02-05 17:52:36 -08:00
James Turnbull eda9c14cb9 Merge pull request #10560 from MihaiB/docs-typo 
docs: fix typo
 2015-02-06 00:42:45 +01:00
James Turnbull abdfb21e3a Merge pull request #10521 from SvenDowideit/docs-not-ready-yet 
remove swarm, machine and compose from the 1.5.0 release docs
 2015-02-05 03:42:14 +01:00
Fred Lifton e13a0de7aa Merge pull request #10575 from SvenDowideit/elide-dhe-docs 
The DHE documentation will not be published with 1.5.0
 2015-02-04 18:16:42 -08:00
Fred Lifton 6dd2364dc2 Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix 
Fix a small spelling error in the dm.blkdiscard docs
 2015-02-04 17:42:31 -08:00
Qiang Huang 0c0f0d5ab4 update docs for memory and memoryswap 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-02-05 09:12:56 +08:00
Sven Dowideit fcb975cfd1 Fix a small spelling error in the dm.blkdiscard docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:57:33 +10:00
Sven Dowideit 16a15ea581 Add an initial list of new features in Docker Engine 1.5.0 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:37:15 +10:00
Sven Dowideit a7a9ce2635 remove swarm, machine and compose from the 1.5.0 release docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:30:57 +10:00
Sven Dowideit 9867dfa617 The DHE documentation will not be published with 1.5.0 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:26:53 +10:00
Sven Dowideit 1cc774b4fa Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace 
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
 2015-02-05 10:21:00 +10:00
Sven Dowideit 2507e0b64f For now, docker stats appears to be libcontainer only 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:12:05 +10:00
Mihai Borobocea 48ee443eca docs: fix typo 
There are 2 not 3 RUN instructions in the userguide's Dockerfile.

Signed-off-by: Mihai Borobocea <MihaiBorobocea@gmail.com>
 2015-02-04 23:15:18 +02:00
Jessie Frazelle a271eaeba2 Merge pull request #10547 from duglin/Issue10214 
Pretty the help text
 2015-02-04 11:31:18 -08:00
Fred Lifton 8a91926cd9 Merge pull request #10522 from SvenDowideit/fix-swarm-links 
use the same paths as in the swarm repo, so that their links magically w...
 2015-02-04 10:19:19 -08:00
Doug Davis 2203b37733 Pretty the help text 
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-04 07:59:16 -08:00
Sven Dowideit ea6db8af18 Spelling mistake in dockerlinks 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-04 12:12:46 +10:00
Fred Lifton 165ea5c158 Merge pull request #10507 from jbruni/patch-1 
Remove File List
 2015-02-03 17:33:15 -08:00
Jessie Frazelle 0018afebb8 Merge pull request #10480 from yihangho/docstypo 
Fix a tiny typo.
 2015-02-03 14:37:35 -08:00
Jessie Frazelle 71368c520e Merge pull request #10483 from Thell/master 
Update dockerfile_best-practices.md
 2015-02-03 14:36:24 -08:00
Sven Dowideit 072fbf9271 The reference menu is too big to list more than the latest API docs, so the others can be hidden - they're still linked from the API summary 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-03 14:04:08 +10:00
Sven Dowideit 1da2abb596 use the same paths as in the swarm repo, so that their links magically work 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-03 13:55:08 +10:00
Sven Dowideit e58fdaae05 Docker attach documentation didn't make sense to me 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-03 11:53:14 +10:00
James Turnbull 895f9a679b Merge pull request #10509 from chenhanxiao/cli-events-since 
docs: change events --since to fit RFC3339Nano
 2015-02-03 01:03:40 +01:00
Michael A. Smith 9f6e7e9aed Distinguish ENV from setting environment inline 
It's ambiguous to say that `ENV` is _functionally equivalent to prefixing the command with `<key>=<value>`_. `ENV` sets the environment for all future commands, but `RUN` can take chained commands like `RUN foo=bar bash -c 'echo $foo' && bash -c 'echo $foo $bar'`. Users with a solid understanding of `exec` may grok this without confusion, but less experienced users may need this distinction.

Signed-off-by: Michael A. Smith <msmith3@ebay.com>

Improve Environment Handling Descriptions

- Link `ENV` and `Environment Replacement`
- Improve side-effects of `ENV` text
- Rearrange avoiding side effects text

Signed-off-by: Michael A. Smith <msmith3@ebay.com>
 2015-02-02 14:55:25 -05:00
Chen Hanxiao d619b5594b docs: change events --since to fit RFC3339Nano 
PR6931 changed time format to RFC3339Nano.
But the example in cli.md does not changed.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-02-02 22:39:03 +08:00
J Bruni aceb735dba Remove File List 
This list is outdated. It could be updated instead of removed... but why should it be maintained? I do not see a reason.

Signed-off-by: João Bruni <contato@jbruni.com.br>
 2015-02-02 09:47:19 -02:00
Chen Hanxiao f0c9818eba docs: fix another typo in docker-build man page 
s/arbtrary/arbitrary

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-02-02 10:39:28 +08:00
James Turnbull 74475325bc Merge pull request #10464 from johnktims/patch-1 
Fix documentation typo
 2015-02-02 00:12:45 +01:00
Thell 'Bo' Fowler cb3be586d6 Update dockerfile_best-practices.md 
Signed-off-by: Thell Fowler <Thell@tbfowler.name>
 2015-01-31 11:02:09 -06:00
Yihang Ho 50c3ffd009 Fix a tiny typo. 
'saving', not 'saveing'

Signed-off-by: Yihang Ho <hoyihang5@gmail.com>
 2015-02-01 00:37:27 +08:00
John Tims 2f5919966a Fix documentation typo 
Signed-off-by: John Tims <john.k.tims@gmail.com>
 2015-01-30 12:44:42 -05:00
Phil Estes 6a1da678de Add missing $HOST in a couple places in HTTPS/TLS setup docs 
Fix typos in setup docs where tcp://:2376 is used without the $HOST
parameter.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2015-01-30 11:20:50 -05:00
Jessica Frazelle 80b843b731 Some small updates to the dev env docs. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-29 16:01:05 -08:00
Alexandr Morozov f750f17451 Update events format in man page 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-01-29 15:18:25 -08:00
Fred Lifton c12fb48a8a Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs 
DHE documentation placeholder and Navbar changes
 2015-01-29 10:23:57 -08:00
Fred Lifton 5b9b5aff06 Merge pull request #10293 from SvenDowideit/test-9952 
comment out the docker and curl lines we'll run later
 2015-01-29 10:18:53 -08:00
Fred Lifton 9e10a888a3 Merge pull request #10428 from mehulkar/patch-1 
Improve explanation of port mapping from containers
 2015-01-29 10:07:24 -08:00
Mehul Kar f1bc02e91f Improve explanation of port mapping from containers 
Signed-off-by: Mehul Kar <mehul.kar@gmail.com>
 2015-01-29 09:09:44 -08:00
James Turnbull ba8e1673ad Merge pull request #10351 from duglin/FixDocsWorkdir 
Fix docs so WORKDIR mentions it works for COPY and ADD too
 2015-01-29 09:52:01 -05:00
Sven Dowideit 0ce3a49d64 DHE documentation placeholder and Navbar changes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-29 20:50:43 +10:00