Commit Graph

3696 Commits

Author SHA1 Message Date
892d0c95d1 Merge pull request #13810 from d23/syslog-facility
Add syslog-facility option
Upstream-commit: 4dd1d1bfa5ddb7295d001c5df35865da34ac048b
Component: engine
2015-06-23 12:05:15 -07:00
f157b240b8 Add --log-opt to specify facility for syslog driver
Signed-off-by: Dennis Docter <dennis@d23.nl>
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
42eb9b230f Commenting out the release-notes for 1.6
Original text

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: efef353a297078a6036e071980e344e1534449e9
Component: engine
2015-06-21 20:41:43 -07:00
22bde0c0c1 Merge pull request #12099 from moysesb/12078-binary_remote_context
Handle binary remote contexts when creating builder jobs.
Upstream-commit: 7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7
Component: engine
2015-06-21 13:59:26 -07:00
36a670da43 Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
fix #11094 - Allow 'docker import' to load from local files
Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c
Component: engine
2015-06-20 12:17:58 -07:00
8b52aa6697 work on #11094 allow import from local file
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3
Component: engine
2015-06-20 09:04:43 +02:00
8bf35a9b77 rpm name and location
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: a0a010e2e3977f6f9e6271d3bb9e7abed783d47a
Component: engine
2015-06-20 01:14:58 +02:00
265055473c Support downloading remote tarball contexts in builder jobs.
Signed-off-by: Moysés Borges <moysesb@gmail.com>
Upstream-commit: d48bface59ef28aedc692c1f7c51a7ddde94a7fe
Component: engine
2015-06-19 16:35:00 -03:00
a4ba2df73f Fix the url in comparison of "COPY" and "RUN curl"
From context on next line,`tar -xJC` implies
the file is `big.tar.xz` instead of `big.tar.gz`.

Signed-off-by: Wenxuan Zhao <viz@linux.com>
Upstream-commit: 3dd134cecaa045e73706c6ce4ab55188e98d1066
Component: engine
2015-06-18 12:33:46 -04:00
c6caf278a1 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
759c0c7705 First pass of updates
Working docs
Update after check
update to centos 7 after second test
Updating with hopefully correct urls
Adding thaJetzah's comments
Updating with the new images
Updating after a visual check

Signed-off-by: Mary Anthony <mary@docker.com>

Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f9ab04ad13863fca6e7b0f3d519dc9e0b08fc567
Component: engine
2015-06-16 16:29:11 -07:00
8758fd6f1e Remove sources/ under docs directory
See #13936.

Signed-off-by: ChaYoung You <yousbe@gmail.com>
Upstream-commit: 3f4eeca68f49a979e2d0af33a7d89bf3ceb62a73
Component: engine
2015-06-16 19:15:48 +09:00
9a276424db retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
f29d02bba3 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
2015-06-15 16:25:59 +02:00
57eb64c9c0 Carry of PR #13520
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
2015-06-13 09:27:30 -07:00
64aa4080a0 Fix docs URL not using https.
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 212dfb45dec64b470307aec22623f2d80be6695f
Component: engine
2015-06-11 04:50:50 +00:00
64af46488a update gitignore for new manpages
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f88e620359eaf986a843714126a9a7df5e25e115
Component: engine
2015-06-10 16:11:15 -07:00
84b8fc6fe1 Moving man pages out of docs
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
2015-06-10 13:43:35 -07:00
0c0594818f add UDP GELF logging-driver
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
2015-06-10 20:21:50 +02:00
52e2bdb4c8 Merge pull request #13754 from cpuguy83/13753_fix_events_64
Default events since to current time
Upstream-commit: 12149e829369e879a1978420b6ec2100a4b4fadd
Component: engine
2015-06-10 10:34:13 -07:00
5a71e1d7b0 Default events since to current time
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
2015-06-10 12:37:40 -04:00
7b52c53f62 Typo psuedo - pseudo
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
2015-06-10 13:27:55 +02:00
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