9910f511b8
Merge pull request #24519 from thaJeztah/add-pidmode-api-docs
...
Add missing API docs for HostConfig.PidMode
Upstream-commit: c7b283bbe3df5fe7a13340deab44d52a5a40ad5e
Component: engine
2016-07-12 12:31:58 +02:00
ab7f449517
Merge pull request #24522 from hairyhenderson/clarify-build-args-secret-warning
...
Clarify warning against using build-time variables for secrets
Upstream-commit: 024b467ebef4a0dddce2ca382acad6a07be1d756
Component: engine
2016-07-12 12:13:37 +02:00
fa96a03fc7
Merge pull request #24464 from tonistiigi/waitandassert
...
Use waitAndAssert to test node state changes
Upstream-commit: 1685b605a83d6dcfd0dc97ce394a435711805de4
Component: engine
2016-07-12 10:05:55 +02:00
1da671b499
Merge pull request #24229 from anusha-ragunathan/shutdown-plugins
...
Shutdown plugins during daemon shutdown.
Upstream-commit: b91e2dd9942f4c34b62de37c3862b9febd270b22
Component: engine
2016-07-11 22:14:50 -04:00
fb15fd3401
Clarify warning against using build-time variables for secrets
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
Upstream-commit: 9af24ba3ac9c2efbb8ec7edef4668650a3c31834
Component: engine
2016-07-11 21:21:33 -04:00
9557e1e984
Merge pull request #24501 from hqhq/remove_exec_driver
...
Remove execution driver
Upstream-commit: 880484992c360881dc57a3317b84d75300c358af
Component: engine
2016-07-11 16:54:36 -07:00
32cd0213a9
Add missing API docs for HostConfig.PidMode
...
The `--pid` flag was added in Docker 1.5.0, but the
API changes were not documented. In Docker 1.12.0,
`--pid=container:<name|id>` was added as an additional
option, but also undocumented.
This adds the missing API documentation for this
option.
Also see commits
47e3da848ffbe88d0188ae6cfc09d6e1668bc293 (for 1.5.0), and
ebeb5a0422be47e703353e327606a380eb9962ab (for 1.12.0).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2c9b5addc5022dba33d5d0443b49b2e4c0041ef3
Component: engine
2016-07-12 01:52:42 +02:00
dac465995a
Merge pull request #23513 from mansinahar/update-content-trust-doc
...
Change content-trust doc to not point to images that don't exist #22730
Upstream-commit: 6dc2dd441024021ef8ca09746286e880efac64d1
Component: engine
2016-07-11 23:42:53 +02:00
495149133d
Shutdown plugins during daemon shutdown.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 863ab9ab134d0baef3c7e5d745eded891e87e734
Component: engine
2016-07-11 14:21:27 -07:00
4451288540
Merge pull request #24427 from swernli/remove_custom_images
...
Removing Custom Images support
Upstream-commit: b215c4c9748c008b5bdcd3ea267ac21e666da1ff
Component: engine
2016-07-11 14:01:41 -07:00
7fcae13aa7
Merge pull request #24474 from mavenugo/fix-24452
...
swarmkit expects network-id for as target
Upstream-commit: 36f3d4af233acd7c32caf94ed98ccee4585cc1f7
Component: engine
2016-07-11 20:59:38 +02:00
399c37eb85
Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist
...
output some details when stack name does not exist
Upstream-commit: 46649755f8771e38b2c74352327a226f1c995843
Component: engine
2016-07-11 20:43:09 +02:00
76868ad0c3
Merge pull request #24471 from joaofnfernandes/broken-link
...
Fixes broken link in docs.
Upstream-commit: c6d550be98555277124299bcc4e825286a949931
Component: engine
2016-07-11 19:43:37 +02:00
44b64e6459
Fixes broken link in docs.
...
Fixes #24428
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 6c9b5da5a17adccc06cbee31d1e674f89644030b
Component: engine
2016-07-11 10:20:01 -07:00
113ca78a6b
Use waitAndAssert to test node state changes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f02ec39e99bfd36f34a965f78d853e19234e513b
Component: engine
2016-07-11 10:01:14 -07:00
04c06a5318
return err when stack name does not exist
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 416613f2e54581c62d3efa1c4f0288b6e7d58365
Component: engine
2016-07-12 00:59:30 +08:00
e2e3de5c59
Change content-trust doc to not point to images that don't exist #22730
...
Signed-off-by: Mansi Nahar <mmn4185@rit.edu >
Upstream-commit: 82d70f440952951f2ce8aee34f3f750f540aed38
Component: engine
2016-07-11 12:41:03 -04:00
a7e56d2212
Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs
...
[Docs code snippets] Make it obvious what is command what is result
Upstream-commit: c9e739011574f3b3fb0a1f450e69304b6dbdabf6
Component: engine
2016-07-11 08:26:30 -07:00
47121a7e47
Merge pull request #24488 from lchi/master
...
Fix grammar in docker volumes tutorial
Upstream-commit: 8c43c7293b87f2d3dd66744a7ce69bc00b7f7883
Component: engine
2016-07-11 17:16:04 +02:00
6c06986ed1
Fix grammar in docker volumes tutorial
...
Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com >
Upstream-commit: 7b3ac47fa4c2dd6850959c3c230289eefbc4dbe3
Component: engine
2016-07-11 10:34:02 -04:00
737108710c
Merge pull request #24139 from runshenzhu/health-check
...
add health check in docker build-in swarm mode
Upstream-commit: e2fc1439a11cff5f719ae47265da135d26dd36ad
Component: engine
2016-07-11 09:43:59 -04:00
e6318e2a96
Merge pull request #24390 from medallia/deduplicate-volstorage-create
...
Remove code duplication in VolumeStore Create CreateWithRef
Upstream-commit: ed5e6b4e60945b53ec0bfa7cf409eac3ea8ea448
Component: engine
2016-07-11 09:25:11 -04:00
abbe69120e
Remove execution driver
...
We use containerd and there is no execution driver anymore.
Addresses: https://github.com/docker/docker/issues/24461
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1fb1136fecfd761300a38f64ac9178979cc0b270
Component: engine
2016-07-11 14:52:27 +08:00
cacc475cf4
Merge pull request #24490 from runcom/net-none-tests
...
integration-cli: fix --net=none tests
Upstream-commit: 8f3be176d26948dfac9b6d855034dabae78454be
Component: engine
2016-07-11 11:39:17 +08:00
dd59a5931c
integration-cli: fix --net=none tests
...
Example:
21:28:01 [d68573521] waiting for daemon to start
21:28:01 [d68573521] daemon started
21:28:01 docker_api_swarm_test.go:163:
21:28:01 c.Assert(d1.Init(map[string]bool{"worker": true}, ""),
checker.IsNil)
21:28:01 ... value *errors.errorString =
&errors.errorString{s:"initializing swarm: invalid statuscode 500,
\"{\\\"message\\\":\\\"could not determine local IP address: dial udp
8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing
swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not
determine local IP address: dial udp 8.8.8.8:53: connect: network is
unreachable\\\"}\\n\"")
21:28:01
21:28:01 [d68573521] exiting daemon"}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394
Component: engine
2016-07-10 15:56:02 +02:00
2768065432
Merge pull request #24468 from yongtang/24374-docker-info-seccomp
...
Fix seccomp output in `docker info`
Upstream-commit: bc5fa7c5e04f776ee5a4636a78b59462463b92ac
Component: engine
2016-07-10 04:22:26 -07:00
eb739e9c8e
Merge pull request #24459 from tonistiigi/update-swarmkit
...
Update swarmkit to 6478bc19cf
Upstream-commit: 602f1c02d9c4d1838ada9e3ad60559defc5f38ca
Component: engine
2016-07-08 23:40:27 -07:00
e6a800a619
Merge pull request #24425 from cpuguy83/add_make_run
...
Add target for `make run`
Upstream-commit: 3ab080a4bd105d630bc1d67808bdc04bc4b4698e
Component: engine
2016-07-08 21:10:19 -04:00
f2aefa4f7f
swarmkit expects network-id for as target
...
For any operation that involves netwoks (other than network create),
swarmkit expects the target as network-id. Service upate was using
network-name as the target and that caused the issue.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b32cfb32a3f654f27bc9d4356b36c6a7e5e53b21
Component: engine
2016-07-08 18:00:41 -07:00
f711cd5f01
Fix seccomp output in docker info
...
This fix tries to address the issue raised in #24374 where
`docker info` outputs seccomp support in Ubuntu 14.04 but
the seccomp wass not actually supported.
The issue is that in the current docker implementation, seccomp
support is only checked against the kernel by inspect CONFIG_SECCOMP
and CONFIG_SECCOMP_FILTER. However, seccomp might not be enabled
when building docker (through golang build flag).
This fix adds a supportSeccomp boolean variable. The supportSeccomp
is only set to true when seccomp is enabled when building docker.
This fix fixes #24374 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a3b9dd89a1b19e7f84617b91f3756ae816c11035
Component: engine
2016-07-08 17:26:42 -07:00
727d754fd1
Add more complicated demotion testcases
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a3f1577365f7b2ed99d1801c909bfaa69c048c92
Component: engine
2016-07-08 13:33:40 -07:00
8d74981897
Add logdrivers to executor from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8a50315f3ce89b24e3556dba288b2ce7b4daf026
Component: engine
2016-07-08 13:33:40 -07:00
7ac8dc18c4
Update executor volumes from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6586f4f0719ae59c4a2b74acd91a1a888a0018b5
Component: engine
2016-07-08 13:33:40 -07:00
602a872e10
vendor: update swarmkit to 6478bc19
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4d12e64cd4893cbd9f7a6078851f4e3c9c6fd3a5
Component: engine
2016-07-08 13:33:15 -07:00
e28870f6c9
Add target for make run
...
`make run` allows you to fire up a daemon (in a container) just using
the existing built binaries. This allows for more rapid iteration
instead of dealing with firing up a shell just to start the daemon.
By default the daemon will listen on port 2375 on the default network
interface.
If a port forward is required to access the daemon, the user can set
`make DOCKER_PORT=2375 run` to get a port forward on a random port with
the daemon listening on port 2375, or `make DOCKER_PORT=2375:2375 run`
to get a daemon running with port 2375 forwarded to the daemon running
on 2375.
Note that the daemon is automatically configured to listen on whatever
port is set for the container side of the `DOCKER_PORT` port spec.
When running on docker4mac, the user must do the following:
```
$ make BINDDIR=. DOCKER_PORT=2375 run
```
This makes sure the binaries are loaded in the container and a port is
forwarded, since it is currently impossible to route traffic from the
mac directly to a container IP.
To get a fresh binary:
```
$ make BINDDIR=. DOCKER_PORT=2375 binary run
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: cae890bc79f7cf2a9d482453f0589d35d3f0a41c
Component: engine
2016-07-08 16:25:21 -04:00
96946b647b
Merge pull request #24460 from thaJeztah/make-archive-link-absolute
...
Make archive links absolute
Upstream-commit: ad969f1aa782478725a7f338cf963fa82f484609
Component: engine
2016-07-08 12:37:32 -07:00
1a5af00ee4
Merge pull request #24119 from albers/completion-swarm-mode
...
Fix & improve bash completion for swarm mode commands
Upstream-commit: 2664f374527d160b14f55b5547fef14f0e813eec
Component: engine
2016-07-08 15:34:51 -04:00
da13a0bd34
Make archive links absolute
...
The archive is only available on docs.docker.com, and not
when doing a "make docs", so relative links will not resolve.
Making these links absolute, so that they always
point to the live "docs.docker.com" domain.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4b090ae5f259dcedb946463a8512b2416a971fcb
Component: engine
2016-07-08 12:06:36 -07:00
1f5dadc0e0
Merge pull request #24389 from Microsoft/jjh/silentsecurity
...
Windows: No security warning on quiet
Upstream-commit: db435560b38e4489ff3b0a8031d7b5110961fd32
Component: engine
2016-07-08 11:06:33 -07:00
e1639e03c6
Merge pull request #24358 from AkihiroSuda/fixdockertop
...
Validate arguments for `ps` in `docker top`
Upstream-commit: 152f5a5cedb062c26745cab81159b6bb2e05c0b1
Component: engine
2016-07-08 10:57:13 -07:00
eaf2bbac5f
Merge pull request #24435 from cpuguy83/24350_cleanup_on_no_running_containers
...
Fix daemon not cleaned up w/ live restore enabled
Upstream-commit: a34534fe95f0b7378837a5d5993b1058d41a635e
Component: engine
2016-07-08 10:23:14 -07:00
4e31188a93
Merge pull request #24431 from mavenugo/revert
...
Check for swarm-mode network conflict during create network
Upstream-commit: e10c11e4a1ac39a408f7503b594207e481387c87
Component: engine
2016-07-08 09:41:34 -07:00
488c448cbd
Merge pull request #24449 from justincormack/proxy-rpmfiles
...
Add missing docker-proxy into managed files in rpm spec
Upstream-commit: 590a5ca18c9fd9682a143b24b3d636c63555573d
Component: engine
2016-07-08 09:12:27 -07:00
3d5be41442
Merge pull request #24450 from runcom/fix-systemd-defaultRuntime
...
daemon: ensure we set default options to stock runtime
Upstream-commit: 9d10221a1c433799fa07672ef9fcdebb8d99698f
Component: engine
2016-07-08 08:52:18 -07:00
bff94672e9
daemon: ensure we set default options to stock runtime
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 59162641cc20640afb785540b5f47178835de656
Component: engine
2016-07-08 15:58:06 +02:00
7ad6d3bf27
Add missing docker-proxy into managed files in rpm spec
...
This was missed in #23312 even though the other parts of
this were fixed.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 47ace5cd989103f7d646282fce66434b5a3c13f6
Component: engine
2016-07-08 14:15:57 +01:00
5bd4fa63c5
Update binary install docs with new contents of tgz
...
This is now up to date with contents of 1.12 tgz
Also change usage to `dockerd` not `docker daemon`
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 7102e09f29822e4bb0e375738c5194ded8b716ca
Component: engine
2016-07-08 13:33:41 +01:00
6bce8d3d1e
Merge pull request #24412 from justincormack/aarch64-ltdl
...
Add ltdl dependencies for aarch64
Upstream-commit: 012f9f4cb8c62a624728bcadb16d06c79f5d7c0f
Component: engine
2016-07-08 12:26:05 +02:00
6e2ed85ac6
Validate arguments for ps in docker top
...
Fix #24357
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 253933220965574422aa6679255359d8bd15d435
Component: engine
2016-07-08 05:58:11 +00:00
4aeaa2fa8d
Merge pull request #24432 from sfsmithcha/doc_service_constraint
...
add constraint to service create ref
Upstream-commit: 63186c06cb7ea5c437d6a3faa1c3f190134c7be5
Component: engine
2016-07-07 21:06:50 -07:00
