0852170e8c
Merge pull request #14923 from Djelibeybi/fix14905
...
Switch to using only the RPM command to determine the distro version.
2015-07-27 12:01:57 -07:00
d0215376f8
Merge pull request #15044 from jlhawn/fix_15042
...
[integration-cli] fix windows build test cases
2015-07-27 11:47:56 -07:00
d06ffd0a5f
[integration-cli] fix windows build test cases
...
Use the same IP as the DOCKER_HOST when making a remote file server.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-27 11:30:38 -07:00
afac39d308
Merge pull request #15026 from duglin/Issue14837
...
Add a test for using -f w/git repo on build
2015-07-27 10:55:47 -07:00
db647c3b60
Merge pull request #15031 from liubin/typo/liubin-change-restart-command
...
Change restarting Docker daemon command in CentOS
2015-07-27 10:54:55 -07:00
4dbdd98b41
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
2015-07-27 10:46:32 -07:00
6e1d887722
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
2015-07-27 10:46:10 -07:00
33bd41df94
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
2015-07-27 10:42:07 -07:00
a62dabe0b4
Merge pull request #14278 from squaremo/separate_overlay_docs
...
Put the network UI and overlay docs in separate files
2015-07-27 10:41:17 -07:00
fdb932fa17
Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
...
Updated volume-driver plugin api docs
2015-07-27 10:39:15 -07:00
f3af9c8bdb
Merge pull request #14735 from charleswhchan/patch-1
...
Minor edits to Environment variables section
2015-07-27 10:37:39 -07:00
2f5dc43ca2
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
2015-07-27 10:31:08 -07:00
303345dc6a
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
2015-07-27 10:28:50 -07:00
70842ea942
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
2015-07-27 10:27:29 -07:00
b48b6de623
Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go
...
Remove pkg/systemd/booted.go
2015-07-27 10:22:58 -07:00
5329d28536
Merge pull request #14971 from moxiegirl/man-page-carry-14637
...
Carry man page for the load command
2015-07-27 10:18:44 -07:00
912bafcf36
Merge pull request #14981 from calavera/bump_api_version
...
Bump api version to 1.21.
2015-07-27 10:17:24 -07:00
35250b685c
Merge pull request #15009 from larchunix/devel
...
Fix docker-rm man page formatting
2015-07-27 10:16:57 -07:00
c451d597f2
Merge pull request #15028 from vbatts/typo
...
api/client/build: typo in error
2015-07-27 10:13:05 -07:00
e89aec0dfb
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
2015-07-27 10:08:21 -07:00
f0f753d70a
Merge pull request #14988 from ChanderG/master
...
Fix minor typo in Debian installation docs
2015-07-27 09:51:58 -07:00
0eb88a0751
Bump api version to 1.21.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-27 09:48:47 -07:00
b2930933c9
Merge pull request #14974 from duglin/BetterTrustErr
...
Show exact file being parsed on error.
2015-07-27 09:39:48 -07:00
ec8173b517
Merge pull request #14917 from srust/14915-empty-hostconfig-on-create
...
Check for nil before using HostConfig to adjustCpuShares
2015-07-27 09:38:32 -07:00
ae5c8e3b69
Merge pull request #14786 from brahmaroutu/lint_image
...
image fix lint errors/warnings
2015-07-27 09:25:30 -07:00
6c0c6b120a
Merge pull request #15007 from cles/arch-systemd-network-issue
...
Add arch install docs warning about systemd-network
2015-07-27 09:22:01 -07:00
a65f7acbbf
Merge pull request #14987 from vdemeester/fix-cli-import-docs
...
Add missing documentation to cli/import.md
2015-07-27 09:19:57 -07:00
aa5fc634f1
Change restarting Docker daemon command in CentOS
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-07-27 23:30:06 +08:00
7b4e6fc47b
*: s/direcotry/directory/g typo
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-27 11:29:28 -04:00
0e697ebe6e
api/client/build: typo in error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-27 11:01:26 -04:00
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
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
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
39999edcc9
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
2015-07-26 18:36:37 -07:00
23b0fdc896
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
2015-07-26 17:49:19 -07:00
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
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
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
77adf6abf1
Merge pull request #15012 from johnktims/patch-3
...
Fix typo
2015-07-26 11:04:17 -04:00
7b552c7a37
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com>
2015-07-26 10:53:07 -04:00
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
e1b57b2a87
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 13:27:35 +02:00
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
5297a25b4e
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
2015-07-26 13:03:45 +02:00
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
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
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
b04dd6b7bc
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
2015-07-25 19:20:48 -07:00
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
ceeb22dc6e
Fix minor typo in Debian installation docs
...
Signed-off-by: Chander G <chandergovind@gmail.com>
2015-07-26 03:49:18 +05:30
David Calavera
Jessie Frazelle
Josh Hawn
Alexander Morozov
moxiegirl
bin liu
Vincent Batts
Doug Davis
root
Bardia Keyoumarsi
Stephen Rust
Oriol Francès
Vincent Demeester
James Turnbull
John Tims
Antonio Murdaca
Sebastiaan van Stijn
Michał Czeraszkiewicz
Charles Chan
Arnaud Porterie
Denis Ollier
Chander G