Commit graph

32712 commits

Author SHA1 Message Date
Sebastiaan van Stijn
5d04fe73bf
Simplify DockerRegistrySuite.TestUserAgentPassThrough()
This patch simplifies the test by;

- re-using the registry-mock / handler
- skipping the last `docker build`, which was only
  used to make sure a local image was present. Instead,
  the daemon is started with a `busybox` image loaded.

Also added a comment, explaining why the mock always
returns a 404 (hence, error/output-string should not
be checked in the test), and made the mock return a
valid/correctly formatted error response.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 20:18:03 +02:00
Sebastiaan van Stijn
ebe66b1d0f
Use tempdir instead of working directory as build-context
The `makefile()` utility was used to create a temporary Dockerfile, and after
tests completed, this file was deleted.

However, the _build_ used the current path (`/usr/local/bin/docker`) as
build-context. As a result, roughtly 20 MB was sent as build-context for each
build, but none of the builds actually required a build-context.

This patch;

- creates a temp-dir for the test, which can be used as build-context
- changes the `makefile()` utility and removes the `cleanup` functionality
- instead, the `temp-dir` is removed after the test finishes (which also removes the temporary `Dockerfile`)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 20:14:48 +02:00
Sebastiaan van Stijn
dd790d0e37 Merge pull request #33608 from thaJeztah/backport-29083
"back port" #29083
2017-06-12 19:54:37 +02:00
Kenfe-Mickaël Laventure
df33013720 Merge pull request #33629 from thaJeztah/disable-v1-registry-by-default
Disable legacy (v1) registries by default
2017-06-12 13:11:34 -04:00
Kenfe-Mickaël Laventure
c23d76b29b Merge pull request #33634 from mavenugo/sdh
Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d
2017-06-12 09:30:58 -07:00
Kenfe-Mickaël Laventure
135bd20585 Merge pull request #33620 from cpuguy83/skip_size_on_mounted_local_volumes
Do not calculate size for local volumes with mount
2017-06-12 11:40:55 -04:00
Sebastiaan van Stijn
0314d4f828 Merge pull request #33636 from thaJeztah/remove-ci-for-email-flag
Remove "-e" / "--email" from integration tests
2017-06-12 16:19:30 +02:00
Sebastiaan van Stijn
a7672b8331
Remove "-e" / "--email" from integration tests
This option is no longer supported in docker 17.06,
so should not be used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 13:32:47 +02:00
Sebastiaan van Stijn
2b8f0eef73 Update docs, completion scripts for disable-legacy-registry
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 11:04:37 +02:00
Sebastiaan van Stijn
128280013f
Disable legacy (v1) registries by default
Deprecation of interacting with v1 registries was
started in docker 1.8.3, which added a `--disable-legacy-registry`
flag.

This option was anounced to be the default starting
with docker 17.06, and v1 registries completely
removed in docker 17.12.

This patch updates the default, and disables
interaction with v1 registres by default.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 11:04:28 +02:00
Madhu Venugopal
6868b8ef23 Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d
Contains Service Discovery hardening fixes via
https://github.com/docker/libnetwork/pull/1796

Fixes multiple issues such as #32830

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-06-12 01:01:45 -07:00
Sebastiaan van Stijn
3f6b6c2981 Merge pull request #33612 from thaJeztah/bump-api-version
Bump API version
2017-06-10 02:00:45 +02:00
Brian Goff
0822d90364 Do not calculate size for local volumes with mount
Local volumes support mount options which, when in use, can mount
external file systems. We don't really need to enumerate these external
filesystems which may be a very slow process.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-06-09 18:28:46 -04:00
Sebastiaan van Stijn
4741c02605 Merge pull request #33590 from ijc/update-grpc
Update grpc to v1.3.0 and bump protobuf bindings.
2017-06-09 23:20:08 +02:00
Vincent Demeester
c9f26eaaf8 Merge pull request #33609 from thaJeztah/backport-29418
backport #29418 "Fix buildIpamResources()" to master
2017-06-09 19:18:50 +02:00
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
Brian Goff
4721844811 Merge pull request #33424 from allencloud/add-swarm-unlock-test-in-client
add swarm unlock test in client
2017-06-09 08:39:23 -04: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
27498a3c60
Merge pull request #29418 from aboch/p66
[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-09 13:51:43 +02:00
Victor Vieux
9ffbc8b814
Merge pull request #29083 from cpuguy83/fix_volume_rm_metadata
[1.12.x] Fix issue where volume metadata was not removed
(cherry picked from commit 7613b23a58)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Conflicts:
	volume/store/store.go
	volume/store/store_test.go
2017-06-09 13:44:59 +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
Ian Campbell
379557a958 Update grpc to v1.3.0 and bump protobuf bindings.
and update some dependent packages.

We would like to keep moby/moby and swarmkit somewhat in sync here and
https://github.com/docker/swarmkit/pull/2229 proposes a similar bump to
swarmkit, needed due to https://github.com/docker/swarmkit/pull/1965 which
pulls in containerd which uses some newer features of the grpc package.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-08 14:34:23 +01: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