beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32692 commits 14 branches 412 tags 338 MiB
Commit graph

32692 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
7839ff2244
Bump API version 
With the Moby/Docker split, no decisions have been
made yet how, and when to bump the API version.

Although these decisions should not be lead
by Docker releases, I'm bumping the API version
to not complicate things for now; after this bump
we should make a plan how to handle this in future
(for example, using SemVer for the REST api, and
bump with every change).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:58:01 +02:00
Sebastiaan van Stijn
27ca921db1 Merge pull request #32122 from allencloud/choose-rpc-code-to-determine-status-code 
choose rpc code to determine status code
 2017-06-09 14:32:24 +02:00
Sebastiaan van Stijn
c8c16abdb1 Merge pull request #33610 from thaJeztah/docs-cherry-picks 
Docs back ports to master
 2017-06-09 14:22:46 +02:00
Sebastiaan van Stijn
f1a945a577 Merge pull request #33606 from thaJeztah/master-cherry-picks 
Backport 17.05.0-ce changelog to master
 2017-06-09 14:19:35 +02:00
Sebastiaan van Stijn
0ad3e3294e
Merge pull request #33572 from hsluoyz/patch-1 
Add Casbin plugin to the list of Authorization plugins in docs.
(cherry picked from commit 220831d541)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:11:36 +02:00
Doug Davis
3eaec0071c
Merge pull request #32804 from bbodenmiller/patch-1 
remove extra word
(cherry picked from commit 9db03bd8cd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:06:37 +02:00
Brian Goff
fcbd93f520
Merge pull request #32791 from djalal/patch-1 
fix typo
(cherry picked from commit 32a52716b9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:06:31 +02:00
Sebastiaan van Stijn
8fd6547fc3
Merge pull request #32735 from bhavin192/patch-1 
Add note about host-dir in VOLUME
(cherry picked from commit f2fff9d913)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:06:25 +02:00
Vincent Demeester
b4047a849b
Merge pull request #32724 from PatrickLang/patricklang-win-memory 
Adding more on -m and --memory
(cherry picked from commit c3fbca1065)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:06:19 +02:00
Tõnis Tiigi
bc66821abb
Merge pull request #32684 from scjane/patch-3 
Update builder.md
(cherry picked from commit 8310663377)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 14:06:13 +02:00
Victor Vieux
d94f281d78
bump to GA 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 89658bed64)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 11:51:56 +02:00
Victor Vieux
b4d36e47c3
bump to rc2 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit c57fdb2a14)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-09 11:51:45 +02:00
Brian Goff
252e610103 Merge pull request #33598 from aaronlehmann/remove-dumpdaemon 
daemon: Remove daemon datastructure dump functionality
 2017-06-08 22:40:00 -04:00
Lei Jitang
f35157433e Merge pull request #33262 from keloyang/exec-block 
Add a error check in postHijacked to avoid docker exec command blocking.
 2017-06-09 09:20:04 +08:00
Victor Vieux
1a2d2f75f4 Merge pull request #33451 from naveed-jamil-tenpearls/pkg/signal/signal 
Add test coverage to pkg/signal
 2017-06-08 16:51:23 -07:00
Aaron Lehmann
a4c68ee857 daemon: Remove daemon datastructure dump functionality 
When sending SIGUSR1 to the daemon, it can crash because of a concurrent
map access panic, showing a stack trace involving dumpDaemon. It appears
it's not possible to recover from a concurrent map access panic. Since
it's important that SIGUSR1 not be a destructive operation, sadly the
best course of action I can think of is to remove this functionality.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-08 14:08:49 -07:00
Michael Crosby
e57f8a78ae Merge pull request #33520 from naveed-jamil-tenpearls/pkg/term 
Add test coverage to pkg/term
 2017-06-08 13:41:49 -07:00
Victor Vieux
274cc09247 Merge pull request #33546 from runcom/init-runtime-info 
daemon: correctly try to retrieve init/runtime versions
 2017-06-08 10:32:50 -07:00
Sebastiaan van Stijn
d053bdef15 Merge pull request #33583 from naag/33569-logging-plugin-file-inconsistency 
Pass the same log filename to logging plugins on start/stop requests
 2017-06-08 17:36:52 +02:00
Peter Bücker
e908e1a357 Logging driver should receive same file in start/stop request 
Signed-off-by: Peter Bücker <peter.buecker@gmail.com>
 2017-06-08 10:05:52 +02:00
Naveed Jamil
a267248b5a Add test coverage to pkg/term/proxy.go 
Signed-off-by: Naveed Jamil <naveed.jamil@tenpearls.com>
 2017-06-08 12:48:33 +05:00
yangshukui
26231b29e7 Add a error check in postHijacked to avoid docker exec command blocking. 
When user execute docker exec command, docker daemon maybe have err return because
of ExecExists check, and then the hijack stream will not be close, it can lead to
docker exec command block.

Signed-off-by: yangshukui <yangshukui@huawei.com>
 2017-06-08 15:46:50 +08:00
Victor Vieux
cd35e4beee Merge pull request #33577 from crosbymichael/revert-ONCLR 
Revert ONCLR and OPOST changes
 2017-06-07 21:50:38 -07:00
Victor Vieux
a82999cfd3 Merge pull request #33555 from mavenugo/rc3-vin 
Vendoring libnetwork and netlink
 2017-06-07 21:45:05 -07:00
Victor Vieux
1678c7add9 Merge pull request #33578 from mavenugo/taskalias 
Service alias should not be copied to task alias
 2017-06-07 21:44:35 -07:00
Victor Vieux
4051ee6ad6 Merge pull request #33456 from cpuguy83/fix_concurrent_map_access_issue 
Lock container while connecting to a new network.
 2017-06-07 21:44:04 -07:00
Tõnis Tiigi
34536c498d Merge pull request #33362 from dnephin/refactor-uid-maps 
Partial refactor of UID/GID usage to a new struct
 2017-06-07 15:12:10 -07:00
Michael Crosby
a5e83836a4 Revert ONCLR and OPOST changes 
This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.

This also reverts the OPOST changes to the term package to support the
initial change.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-07 13:14:52 -07:00
Vincent Demeester
36db52a704 Merge pull request #33549 from ripcurld0/update_swagger 
Describe the differences between container-inspect and container-list
 2017-06-07 22:08:26 +02:00
Madhu Venugopal
38c1553150 Service alias should not be copied to task alias 
If a service alias is copied to task, then the DNS resolution on the
service name will resolve to service VIP and all of Task-IPs and that
will break the concept of vip based load-balancing resulting in all the
dns-rr caching issues.

This is a regression introduced in #33130

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-07 13:05:15 -07:00
Vincent Demeester
d2c6e78371 Merge pull request #33557 from AkihiroSuda/test-no-unset 
builder: add a test for `ENV name` (without `=value`)
 2017-06-07 17:51:42 +02:00
Daniel Nephin
93fbdb69ac Remove error return from RootPair 
There is no case which would resolve in this error. The root user always exists, and if the id maps are empty, the default value of 0 is correct.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:45:33 -04:00
Daniel Nephin
6150ebf7b4 Remove MkdirAllNewAs and update tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:34 -04:00
Daniel Nephin
df248d31d9 Remove ToHost and replace it with IDMappings.ToHost 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:34 -04:00
Daniel Nephin
acdbc285e2 Fix vfs unit test and port VFS to the new IDMappings 
The test was failing because TarOptions was using a non-pointer for
ChownOpts, which meant the check for nil was never true, and
createTarFile was never using the hdr.UID/GID

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:34 -04:00
Daniel Nephin
5672eeb5e0 Convert tarAppender to the newIDMappings. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:34 -04:00
Daniel Nephin
967ef7e6d2 Remove unused functions from archive. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:33 -04:00
Daniel Nephin
09cd96c5ad Partial refactor of UID/GID usage to use a unified struct. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-07 11:44:33 -04:00
Madhu Venugopal
5fd65a6b6c Vendoring libnetwork and netlink 
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-07 06:20:27 -07:00
Sebastiaan van Stijn
d2a83863ed Merge pull request #33536 from aaronlehmann/silly-sprintfs 
client: Use string concatenation instead of Sprintf
 2017-06-07 11:34:37 +02:00
Akihiro Suda
09eca591f7 builder: add a test for ENV name (without =value) 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-07 05:23:26 +00:00
Akihiro Suda
cd2255a296 Merge pull request #33330 from coolljt0725/fix_sock_is_dir 
Don't create source directory while the daemon is being shutdown, fix #30348
 2017-06-07 12:37:08 +09:00
Tibor Vass
64bb445463 Merge pull request #33463 from mavenugo/ln-vin-1706 
Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
 2017-06-06 20:24:17 -07:00
Victor Vieux
18ce8ce33f Merge pull request #33547 from vieux/report-2017-06-05 
Moby Dev Report 2017 06 05
 2017-06-06 18:56:15 -07:00
Victor Vieux
7a295b0333 Moby report 2017-06-05 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-06-06 18:53:09 -07:00
Yong Tang
54dacaf23e Merge pull request #29427 from yongtang/29325-cleanup-btrfs-quota-groups 
Remove btrfs quota groups after containers destroyed
 2017-06-06 12:51:00 -07:00
Boaz Shuster
e8a1d99afb Describe the differences between container-inspect and container-list 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-06-06 21:33:08 +03:00
Kenfe-Mickaël Laventure
f502499647 Merge pull request #33524 from dnephin/fix-onbuild-copy-cache 
[Builder] Fix Cache with ONBUILD
 2017-06-06 10:44:57 -07:00
Antonio Murdaca
858b4b44c8
daemon: correctly try to retrieve init/runtime versions 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-06-06 19:36:24 +02:00
Daniel Nephin
f1ade82d82 Fix Cache with ONBUILD 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-06 10:52:29 -04:00