bin liu
aa5fc634f1
Change restarting Docker daemon command in CentOS
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-07-27 23:30:06 +08:00
Vincent Batts
7b4e6fc47b
*: s/direcotry/directory/g typo
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-27 11:29:28 -04:00
Vincent Batts
0e697ebe6e
api/client/build: typo in error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-27 11:01:26 -04:00
Doug Davis
d883540440
Adda test for using -f w/git repo on build
...
https://github.com/docker/docker/pull/14546 actually fixed issue #14837
but I don't see a new test to ensure we don't regress. So this PR adds
a test and then we can close #14837 .
Closes #14837
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-27 07:49:42 -07:00
root
b061572916
/image - fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-27 05:40:57 +00:00
Bardia Keyoumarsi
cc997a7f44
Updated volume-driver plugin api docs
...
There was a mistake in the plugin_volume.md file regarding the /VolumeDriver.Remove call.
Added fix and a better explanation.
Signed-off-by: Bardia Keyoumarsi <b.keyoumarsi@gmail.com>
2015-07-26 21:02:42 -07:00
Alexander Morozov
39999edcc9
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
2015-07-26 18:36:37 -07:00
Morgan Bauer
c2cf349bcd
Fix Plugins links
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-26 18:28:25 -07:00
Jessie Frazelle
23b0fdc896
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
2015-07-26 17:49:19 -07:00
Stephen Rust
c358a4cd35
Check for nil before using HostConfig to adjustCpuShares
...
Fix #14915 . Add unit test for #14915 .
Thanks @runcom for the test case: when the client calls 1.18 api
version w/o hostconfig it results in a nil pointer dereference.
Signed-off-by: Stephen Rust <srust@blockbridge.com>
2015-07-26 20:33:04 -04:00
Oriol Francès
26fa9b0d0d
much improved wording for manual network config setup on arch install docs by @moxiegirl
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 19:11:27 +02:00
Vincent Demeester
3101941120
Add missing documentation to cli/import.md
...
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-26 18:39:42 +02:00
James Turnbull
77adf6abf1
Merge pull request #15012 from johnktims/patch-3
...
Fix typo
2015-07-26 11:04:17 -04:00
John Tims
7b552c7a37
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com>
2015-07-26 10:53:07 -04:00
Antonio Murdaca
c9207bc0aa
Format times in inspect command with a template as RFC3339Nano
...
In 1.6.2 we were decoding inspect API response into interface{}.
time.Time fields were JSON encoded as RFC3339Nano in the response
and when decoded into interface{} they were just strings so the inspect
template treated them as just strings.
From 1.7 we are decoding into types.ContainerJSON and when the template
gets executed it now gets a time.Time and it's formatted as
2015-07-22 05:02:38.091530369 +0000 UTC.
This patch brings back the old behavior by typing time.Time fields
as string so they gets formatted as they were encoded in JSON -- RCF3339Nano
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-26 15:25:08 +02:00
Oriol Francès
e1b57b2a87
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 13:27:35 +02:00
Oriol Francès
6bd15a68cf
Add arch install docs warning about systemd-network
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 13:27:07 +02:00
Sebastiaan van Stijn
5297a25b4e
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
2015-07-26 13:03:45 +02:00
Sebastiaan van Stijn
a059701fa5
Merge pull request #15006 from czerasz/patch-1
...
Fix typo in JSON config example, in the CLI documetation
2015-07-26 12:56:38 +02:00
Michał Czeraszkiewicz
09a9958e22
Fix typo in JSON config example, in the CLI documetation
...
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com>
2015-07-26 12:09:31 +02:00
Charles Chan
c6816dfc67
Update faq.md
...
Fix case for PostgreSQL.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-25 22:03:20 -07:00
Arnaud Porterie
b04dd6b7bc
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
2015-07-25 19:20:48 -07:00
Denis Ollier
9356049680
Fix docker-rm man page formatting
...
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com>
2015-07-26 04:18:48 +02:00
Chander G
ceeb22dc6e
Fix minor typo in Debian installation docs
...
Signed-off-by: Chander G <chandergovind@gmail.com>
2015-07-26 03:49:18 +05:30
Sebastiaan van Stijn
6b2b6cb3fc
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
2015-07-25 23:25:48 +02:00
Jessica Frazelle
a2ea8f2ad8
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-25 14:04:39 -07:00
Chris Seto
04f76b67c9
Fix go vet errors
...
Signed-off-by: Chris Seto <chriskseto@gmail.com>
2015-07-25 17:00:10 -04:00
Sebastiaan van Stijn
2d61de4625
Merge pull request #14245 from gs11/master
...
Clarifications in usage
2015-07-25 22:48:48 +02:00
Antonio Murdaca
0e69318b27
Remove unused functions
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-25 19:54:05 +02:00
gs11
547d6c6656
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com>
2015-07-25 14:08:38 +02:00
Sebastiaan van Stijn
c051ed7953
Merge pull request #14720 from icecrime/14662_document_branches_tags
...
Document branches and tags
2015-07-25 13:12:47 +02:00
Alexander Morozov
6b12d37ced
Merge pull request #14941 from hqhq/hq_cli_remove_cleanup
...
Remove unnecessary container cleanup in integration-cli
2015-07-24 20:38:15 -07:00
Tibor Vass
afb831d35e
Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName
...
Fix TestRunNonRootUserResolvName flackiness
2015-07-24 21:50:44 -04:00
Arnaud Porterie
5bdd4d0ec4
Merge pull request #14966 from mrjana/vendor18
...
Vendoring libnetwork
2015-07-24 17:58:23 -07:00
Antonio Murdaca
30d4c70d28
Fix TestRunNonRootUserResolvName flackiness
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-25 02:45:17 +02:00
Arnaud Porterie
4f5b677fd9
Merge pull request #14546 from dmcgowan/trusted-notary-integration
...
Notary integration
2015-07-24 17:44:14 -07:00
Arnaud Porterie
542685d856
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
2015-07-24 17:31:28 -07:00
Jana Radhakrishnan
2ad81da856
Vendoring libnetwork
...
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-24 17:11:47 -07:00
Arnaud Porterie
e4c77b047d
Document branches and tags
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-24 16:56:30 -07:00
Arnaud Porterie
78906612a2
Merge pull request #14935 from stevvooe/registry-moratorium
...
Impose moratorium on remote registry access
2015-07-24 16:45:05 -07:00
Jessie Frazelle
935810bd20
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
2015-07-24 16:43:46 -07:00
David Calavera
94ab0d312f
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3add .
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-24 16:35:51 -07:00
Derek McGowan
259cadb0b1
Rename to flags and environment variables to content trust
...
Update help line to allow 90 characters instead of 80
The trust flag pushes out the help description column wider, requiring more room to display help messages.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-24 16:31:18 -07:00
Diogo Monica
3e90b12d42
Added tests for expired snapshots and timestamps
...
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-07-24 16:31:18 -07:00
Nathan McCauley
268fa5af47
Add tests simulating an evil server
...
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
2015-07-24 16:31:18 -07:00
Derek McGowan
871d2b96ed
Add build integration cli tests
...
Clean up tests to remove duplicate code
Add tests which run pull and create in an isolated configuration directory.
Add build test for untrusted tag
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-24 16:31:12 -07:00
Jessica Frazelle
0a5b8c40c0
ignore certain tests on lxc driver
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 16:10:59 -07:00
Jessie Frazelle
5ab4b60e11
Merge pull request #14969 from tianon/utopic-eol
...
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
2015-07-24 15:48:34 -07:00
Jessica Frazelle
a38b544ef0
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 15:46:51 -07:00
Zhang Kun
0547b5fb2a
#14474 skip DockerSuite.TestRunCapAddCHOWN on lxc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-07-24 15:16:07 -07:00