Commit Graph

24018 Commits

Author SHA1 Message Date
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
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
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
fde455a0e2 Fix daemon not cleaned up w/ live restore enabled
This patch makes sure daemon resources are cleaned up on shutdown if
there are no running containers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d5dc94b9b547a9ba73f7b613e358b03fdfb2b84
Component: engine
2016-07-07 22:25:41 -04:00
6594994c99 Merge pull request #24426 from thaJeztah/add-iptables-to-multi-daemon-docs
add iptables=false to docs for multiple daemons
Upstream-commit: bd37b8305275946c06793278425f9bb83d0bafa9
Component: engine
2016-07-07 18:50:45 -07:00
7cb7f0210f add constraint to service create ref
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 093817031acd2b8dc17cba5c3c994b2d6d19dc0e
Component: engine
2016-07-07 18:25:37 -07:00
e4b8c6fd9c Merge pull request #23312 from justincormack/proxy
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
2016-07-07 17:14:40 -07:00
5133d86660 fixes #23983
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6a4b21bd863f955d05e5df1e54be4dfcf6889870
Component: engine
2016-07-07 16:23:50 -07:00
9280648ffe Revert "Fixed a few network UI issues in swarm-mode"
This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 4623276886033aedb4932c3996c7f61e7fc35861
Component: engine
2016-07-07 16:23:42 -07:00
d206128458 Windows: No security warning on quiet
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a9b3c1d7207e8c4b46b6f7efb3bf5bc3b5160c83
Component: engine
2016-07-07 16:00:08 -07:00
b02186b3ad Merge pull request #24156 from Microsoft/jjh/clearbasefs
Windows: Clear volume path for Hyper-V containers
Upstream-commit: efcf24f0c41412c196390d7208f908d6fc7b9ed6
Component: engine
2016-07-07 15:35:14 -07:00
1af13ec6b5 add iptables=false to docs for multiple daemons
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1255e53e2890149df3c919af7aac88237069e1bb
Component: engine
2016-07-07 14:54:44 -07:00
a83cb2f41d Merge pull request #24291 from vdemeester/docs-cli-reference-updates
Updates on cli reference documentation
Upstream-commit: b98ba9a1d66d9b82eec510fb60a1ff7d7f2e7b0f
Component: engine
2016-07-07 14:28:54 -07:00
d93f3c954e Fix test case for docker_api_swarm_test.go
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6dfba780cc490ef7579e95169b5c71617f8e5a47
Component: engine
2016-07-07 21:01:55 +01:00
2ccfe96ba1 Update swarmkit vendoring
Needed for libnetwork vendoring

Update Secret API name change correspondingly

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
2016-07-07 21:01:54 +01:00
247801dadf Update libnetwork vendoring
Update now that the changes in https://github.com/docker/libnetwork/pull/1230
have been merged

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3ae0c664507e0d8da5e3151f28b8d00316569e47
Component: engine
2016-07-07 21:01:41 +01:00
d634daae27 Updates on cli reference documentation
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4cfc6b9830ed236eb588d6a4dddca7455145e70
Component: engine
2016-07-07 20:43:18 +02:00
a5fef9cf19 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
2016-07-07 11:43:08 -07:00
f7a6ca3323 Merge pull request #22868 from Microsoft/jjh/dockerfilecmd
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
2016-07-07 09:21:26 -07:00
a4ffd2d4e9 Add ltdl dependencies for aarch64
Fixes `make test` and fix #24380 on aarch64

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d37a7394acd7842f588ef423fb076b05fccd1da2
Component: engine
2016-07-07 13:02:19 +01:00
e758a53186 Make the docker proxy a standalone binary not a re-exec
This reduces memory usage with a lot of docker proxy processes.
On Docker for Mac we are currently carrying a patch to replace
the binary as we modify it to forward ports to the Mac rather
than the Linux VM, this allows us to simply replace this binary
in our packaging with one that has a compatible interface. This
patch does not provide an easy way to substitute a binary as
the interface is complex and there are few use cases, but where
needed this can be done.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 0682468431867e3382a759402eb92df5877e310b
Component: engine
2016-07-07 12:53:39 +01:00