Commit Graph

3673 Commits

Author SHA1 Message Date
89751ffa0c Merge pull request #12031 from jlhawn/build_cache_ignore_mtime
Make build cache ignore mtime
Upstream-commit: 90259fed2ecc0b21a41e997bd4812aa845b79dfb
Component: engine
2015-06-09 18:26:07 +02:00
bff41b9dc6 Fix COPY/ADD quoted/json form
Minor tweak to the quoted/json form and made man page look like the Dockerfile
docs.  W/o the `,` people may think there should be a space delimited list.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f4a3e8bef0070af6ad883fd06e504a8b1d4c93ba
Component: engine
2015-06-08 16:40:20 -07:00
4b582bde62 [docs] Update builder docs on last-modified times
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: cd7e2a6b2b529cb4180926352a3fe9e82040d073
Component: engine
2015-06-08 13:55:02 -07:00
87d1d89392 Fix examples in "docker port" man page.
Closes #13667.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: bf6492e689e2cb375fe6b39327dbe0655452640a
Component: engine
2015-06-08 10:40:24 -04:00
32e7cf7b8b Tiny improvements to systemd docs.
Show how to use `systemctl show` and recommend against modifying
system unit files in `/usr` and `/lib`.

Fixes #13796.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 68bfd9e3aea088b644c058be77b5fa24bbdea7f9
Component: engine
2015-06-08 12:05:34 +00:00
b9079beed3 Fix a typo and a minor formatting issue in the docs.
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 173d0918a8ddffe1ba8a057527feccb6bee7f30b
Component: engine
2015-06-07 12:49:03 +00:00
ddadb07458 Merge pull request #13764 from bcexelbi/bexelbie_man_typo
Fixing typo in Dockerfile manpage
Upstream-commit: 3c132ff62d49247abed25a5686611bcac6801b23
Component: engine
2015-06-06 08:50:27 -04:00
3f884b5df5 Merge pull request #13776 from duglin/MinorVolDocEdit
Minor doc edit to add clarity around the --volume path format
Upstream-commit: ffd74e74b19cf402f7d9a98fe77790c4a79655da
Component: engine
2015-06-05 18:41:37 -07:00
21f31995a1 Minor doc edit to add clarity around the --volume path format
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3fcf53db920de9d9111a86bd0eda90a059885754
Component: engine
2015-06-05 15:11:42 -07:00
f298ea7477 Update doc with usage of the scratch image
The scratch image used to be a regular image, but as of
commit 8936789919c5c8004f346f44a3452d1521818b60 it is a
special case, and cannot be used with 'docker pull.'

Update this doc to reflect the new behavior and clear up
confusion surrounding this image.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 77bd53adfe6877acd1ff8f07cf148f1dbe0b425d
Component: engine
2015-06-05 14:47:03 -05:00
8263a87e8d Fixing typo in Dockerfile manpage
Signed-off-by: Brian Exelbierd <bex@pobox.com>
Upstream-commit: d32e01be1ae7e72b4d9e4a6aeb462c60a8dc299c
Component: engine
2015-06-05 16:33:11 +02:00
f4b07b21ea Bring over DHE docs updates for publishing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9ed2cb300b255842a3d318a112784b806c1bf8e7
Component: engine
2015-06-05 21:06:59 +10:00
dc2974419c Merge pull request #13716 from moxiegirl/move-experimental
Moving experimental
Upstream-commit: 4efedb3fba49623de562b189a145c8334eaba609
Component: engine
2015-06-04 09:11:00 -07:00
fd2e1a1b2e Merge pull request #13709 from jfrazelle/update-url
Update urls from .com to .org.
Upstream-commit: ca66419522a40b86ece75b0eb044d6d394acacec
Component: engine
2015-06-03 14:21:38 -07:00
f66c6560f0 Moving experimental
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 95dfc4c4a545c3ca35ad7582bbfe4a627bd6a5fc
Component: engine
2015-06-03 13:43:27 -07:00
961db33814 Update urls from .com to .org.
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 7943bce8942ee8c262180652951216d963fa6202
Component: engine
2015-06-03 13:28:47 -07:00
2d31933cd6 Merge pull request #13165 from ahmetalpbalkan/durations
Allow duration strings as --since/--until
Upstream-commit: f18ce101fbdf6c62a5643f826ed69a8abb843d87
Component: engine
2015-06-03 22:14:42 +02:00
f597f6e48c quick doc fix for windows versions
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com>
Upstream-commit: a448b7aff266545b793a49307764cf1a4a736ab9
Component: engine
2015-06-03 10:28:11 -07:00
d61059b14c Merge pull request #13672 from LK4D4/syslog_tag
Add syslog-tag option
Upstream-commit: 0636bb7b73f49979f8def3d950c5e1d43a602695
Component: engine
2015-06-03 17:04:59 +02:00
4ced50e635 Add docs for ip-forward
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 85fffe1341fc4e957a9a40dbc3cedded8cb44e70
Component: engine
2015-06-03 16:37:40 +08:00
add0a8eb5b Allow duration strings as --since/--until
Fixes #13107. This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.

Added unit tests for pkg/timeutils.GetTimestamp as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
2015-06-02 21:02:47 +00:00
b508114358 Wrap lines for journald docs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3df19749d420b1fae07cb4d7c5b61fbb53b15fa9
Component: engine
2015-06-02 12:46:51 -07:00
21fa65b4fd Tweaking text identified in PR #13147
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cb4af853f62d1e615f5d5ba62139ad5ed7bed5d5
Component: engine
2015-06-02 12:44:47 -07:00
075ef85626 Change address to syslog-address in syslog docs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8979fe4d8a11d5f38e09e4acc6268c56d40ef151
Component: engine
2015-06-02 12:44:23 -07:00
f8248bbabf Add syslog-tag option for syslog log-driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a81af2e26a19cca0ffb8cbfa619169d55d604789
Component: engine
2015-06-02 12:43:00 -07:00
e427ed126a Merge pull request #13654 from porjo/netipv6
Networking docs: add reference to ndppd
Upstream-commit: bdb6fad34cba055c6c7d58851c96dba485e10216
Component: engine
2015-06-02 19:06:17 +02:00
505be591f7 Merge pull request #13633 from ZJU-SEL/fix-doc
fix typo.
Upstream-commit: fbadf11d209496f847b3ecb6ce7e947cbf4f2621
Component: engine
2015-06-02 18:36:52 +02:00
0f40ba9a23 Networking docs: add reference to ndppd
Signed-off-by: Ian Bishop <ianbishop@pace7.com>
Upstream-commit: b1a1cff368e7b7e4c6ad198cf53561d4edf50d38
Component: engine
2015-06-02 15:56:24 +10:00
32a8861dca fix typo.
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 0d72772c372dd2267211a92975ede20f5ac3cb3c
Component: engine
2015-06-02 09:44:52 +08:00
d43db5f8e1 Merge pull request #13644 from mchiang0610/patch-1
Fix - Download button does not download
Upstream-commit: cd79751cfa8d2554923d0cf29216504d660b0a70
Component: engine
2015-06-01 17:33:38 -07:00
85e6643580 Merge pull request #13443 from duglin/CleanupEvents
Cleanup container LogEvent calls
Upstream-commit: cd80a61cc1dd6868eef77852b898f1d25c06641b
Component: engine
2015-06-01 14:04:33 -07:00
912b96c23e Fix - Download button does not download
Fix - Download button does not download

Users got confused when Kitematic is not being downloaded after clicking on the download button, and instead got brought to a screen to teach them how to download Kitematic.

The additional step caused a significant drop in Kitematic downloads. This pull request fixes the issue, to allow users to directly download Kitematic after clicking on the Download button. 

Signed-off-by: Michael Chiang <michael.chiang@docker.com>
Upstream-commit: 5606f32eecc1c9befde331ecc5b653ee4423d020
Component: engine
2015-06-01 13:29:44 -07:00
4f79291859 Cleanup container LogEvent calls
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.

Added testcases for new events: commit, copy, resize, attach, rename, top

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8232312c1e705753d3db82dca3d9bb23e59c3b52
Component: engine
2015-06-01 12:39:28 -07:00
c1e042a6e9 Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
aa1b60b2be Updating after the pr went through
Updating with comments.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3ce27975413a06a76dbdf720aadecf7f04fb6bba
Component: engine
2015-06-01 09:20:31 -07:00
07b08a29ca indicate HostConfig to be used for "create container"
Closes #13614

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 16e649c589ce60ba56812a8fffb98aee34fceb94
Component: engine
2015-06-01 07:04:41 +02:00
7716bbfe5b Fix spelling mistakes in documentation
While reading  some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings) on markdown files

Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>
Upstream-commit: 3d87b80b46d45c2ca7c0fbcbcbb3fcf97a48444b
Component: engine
2015-05-31 11:53:23 -07:00
39e349ea73 Merge pull request #13460 from moxiegirl/add-created-state-diagram
Updating event diagram with the created state. Cool, thank you.
Upstream-commit: 093f57a26134c262b14de801dd577fbce93ad664
Component: engine
2015-05-30 19:47:24 -07:00
858743b549 Merge pull request #13616 from konstruktoid/docs_openssl
Docs: sha256 and 4096 when using openssl
Upstream-commit: 73683e807de28e0236689b7b129bf3e335e76231
Component: engine
2015-05-30 19:20:21 -04:00
f410793dcf aes256 and 4096 bits
squashing down to a single commit and change back to cert.pem

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: 5cd64cb93fe64c6ab7b22ef3dbe4ea06ef5e79b9
Component: engine
2015-05-31 01:05:49 +02:00
f605824756 Merge pull request #13367 from duglin/Issue13353
Add a "Created" state for new containers that haven't been run yet
Upstream-commit: f2154a5a6b2d68258322a9a0677e14b910e7b47d
Component: engine
2015-05-30 19:49:38 +02:00
cc848c594e Add a "Created" state for new containers that haven't been run yet
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
2015-05-30 07:48:46 -07:00
a5d38e0b03 Merge pull request #13580 from vdemeester/update-api-commit
Update api documentation to add labels in commit
Upstream-commit: 279c8774519de0c832c555252770b9368fea5a32
Component: engine
2015-05-30 14:44:05 +02:00
3babe9504e Premature newline insertions
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e51b3111299bb854b0eb59a26884822e59e09903
Component: engine
2015-05-30 04:46:24 -07:00
77c76a3170 Update api documentation to add labels in commit
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c61fa8471a567b4890e0861f8aaff91a68c42e4f
Component: engine
2015-05-30 11:31:51 +02:00
4d18604a08 Merge pull request #13561 from icecrime/warn_overlay_docs
Add note about overlay not being production ready
Upstream-commit: 1613897d2dcc875096eac669532643b8d2c0c1f0
Component: engine
2015-05-30 01:24:02 +02:00
b0be6943f7 Revert api doc for 1.19 about PortSpecs removal
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c42ede311b4fa5dd887c79d5ea2930e07f4f5f11
Component: engine
2015-05-30 00:32:03 +02:00
eafc23fd4d Add note about overlay not being production ready
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 67cb748e26c3b6979983493f307a38b59e291642
Component: engine
2015-05-29 13:53:09 -07:00
6226136075 Remove PortSpecs from Config
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
b652716d1c Merge pull request #13392 from runcom/syslog-connection-url-log-opt
Add syslog-address log-opt
Upstream-commit: f1fed87fc01c31114b78a6ca9f7060fc93480957
Component: engine
2015-05-29 10:21:57 -07:00