Граф коммитов

25835 Коммитов

Автор SHA1 Сообщение Дата
Sebastiaan van Stijn 8c43c7293b Merge pull request #24488 from lchi/master
Fix grammar in docker volumes tutorial
2016-07-11 17:16:04 +02:00
Lucas Chi 7b3ac47fa4 Fix grammar in docker volumes tutorial
Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com>
2016-07-11 10:34:02 -04:00
Brian Goff e2fc1439a1 Merge pull request #24139 from runshenzhu/health-check
add health check in docker build-in swarm mode
2016-07-11 09:43:59 -04:00
Brian Goff ed5e6b4e60 Merge pull request #24390 from medallia/deduplicate-volstorage-create
Remove code duplication in VolumeStore Create CreateWithRef
2016-07-11 09:25:11 -04:00
Akihiro Suda c6b7bd1aa6 Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-07-11 06:55:30 +00:00
Qiang Huang 1fb1136fec 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>
2016-07-11 14:52:27 +08:00
Lei Jitang 8f3be176d2 Merge pull request #24490 from runcom/net-none-tests
integration-cli: fix --net=none tests
2016-07-11 11:39:17 +08:00
Antonio Murdaca 9fadb8fd6a 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>
2016-07-10 15:56:02 +02:00
Sebastiaan van Stijn bc5fa7c5e0 Merge pull request #24468 from yongtang/24374-docker-info-seccomp
Fix seccomp output in `docker info`
2016-07-10 04:22:26 -07:00
Sebastiaan van Stijn 602f1c02d9 Merge pull request #24459 from tonistiigi/update-swarmkit
Update swarmkit to 6478bc19cf
2016-07-08 23:40:27 -07:00
Yanqiang Miao c125bbd5e8 Fix 'make test-docker-py' error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-09 11:52:33 +08:00
Brian Goff 3ab080a4bd Merge pull request #24425 from cpuguy83/add_make_run
Add target for `make run`
2016-07-08 21:10:19 -04:00
Madhu Venugopal b32cfb32a3 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>
2016-07-08 18:00:41 -07:00
Yong Tang a3b9dd89a1 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>
2016-07-08 17:26:42 -07:00
Tonis Tiigi a3f1577365 Add more complicated demotion testcases
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:40 -07:00
Tonis Tiigi 8a50315f3c Add logdrivers to executor from swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:40 -07:00
Tonis Tiigi 6586f4f071 Update executor volumes from swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:40 -07:00
Tonis Tiigi 4d12e64cd4 vendor: update swarmkit to 6478bc19
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:15 -07:00
Brian Goff cae890bc79 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>
2016-07-08 16:25:21 -04:00
Sebastiaan van Stijn ad969f1aa7 Merge pull request #24460 from thaJeztah/make-archive-link-absolute
Make archive links absolute
2016-07-08 12:37:32 -07:00
Brian Goff 2664f37452 Merge pull request #24119 from albers/completion-swarm-mode
Fix & improve bash completion for swarm mode commands
2016-07-08 15:34:51 -04:00
Sebastiaan van Stijn 4b090ae5f2
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>
2016-07-08 12:06:36 -07:00
Sebastiaan van Stijn db435560b3 Merge pull request #24389 from Microsoft/jjh/silentsecurity
Windows: No security warning on quiet
2016-07-08 11:06:33 -07:00
Sebastiaan van Stijn 152f5a5ced Merge pull request #24358 from AkihiroSuda/fixdockertop
Validate arguments for `ps` in `docker top`
2016-07-08 10:57:13 -07:00
Tõnis Tiigi a34534fe95 Merge pull request #24435 from cpuguy83/24350_cleanup_on_no_running_containers
Fix daemon not cleaned up w/ live restore enabled
2016-07-08 10:23:14 -07:00
Sebastiaan van Stijn e10c11e4a1 Merge pull request #24431 from mavenugo/revert
Check for swarm-mode network conflict during create network
2016-07-08 09:41:34 -07:00
Alexander Morozov 590a5ca18c Merge pull request #24449 from justincormack/proxy-rpmfiles
Add missing docker-proxy into managed files in rpm spec
2016-07-08 09:12:27 -07:00
Alexander Morozov 9d10221a1c Merge pull request #24450 from runcom/fix-systemd-defaultRuntime
daemon: ensure we set default options to stock runtime
2016-07-08 08:52:18 -07:00
Antonio Murdaca 59162641cc daemon: ensure we set default options to stock runtime
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-08 15:58:06 +02:00
Vincent Demeester dd1a27ce2a Merge pull request #24448 from justincormack/proxy-docs
Update binary install docs with new contents of tgz
2016-07-08 15:19:09 +02:00
Justin Cormack 47ace5cd98 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>
2016-07-08 14:15:57 +01:00
Justin Cormack 7102e09f29 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>
2016-07-08 13:33:41 +01:00
Antonio Murdaca 012f9f4cb8 Merge pull request #24412 from justincormack/aarch64-ltdl
Add ltdl dependencies for aarch64
2016-07-08 12:26:05 +02:00
Akihiro Suda 2539332209 Validate arguments for `ps` in `docker top`
Fix #24357

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-07-08 05:58:11 +00:00
Sebastiaan van Stijn 63186c06cb Merge pull request #24432 from sfsmithcha/doc_service_constraint
add constraint to service create ref
2016-07-07 21:06:50 -07:00
Brian Goff 2d5dc94b9b 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>
2016-07-07 22:25:41 -04:00
Tibor Vass bd37b83052 Merge pull request #24426 from thaJeztah/add-iptables-to-multi-daemon-docs
add iptables=false to docs for multiple daemons
2016-07-07 18:50:45 -07:00
Charles Smith 093817031a add constraint to service create ref
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-07 18:25:37 -07:00
Lei Jitang f5940ef725 Add IPVLAN and DUMMY to check-config.sh
This commit add DUMMY and IPVLAN to check-config.sh
because they are need for ipvlan and macvlan network
driver.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-07 21:21:57 -04:00
Tibor Vass 07dd69df8d Merge pull request #23312 from justincormack/proxy
Make the docker proxy a standalone binary not a re-exec
2016-07-07 17:14:40 -07:00
Madhu Venugopal 6a4b21bd86 fixes #23983
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-07 16:23:50 -07:00
Madhu Venugopal 4623276886 Revert "Fixed a few network UI issues in swarm-mode"
This reverts commit 0ce5158a2a.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-07 16:23:42 -07:00
John Howard a9b3c1d720 Windows: No security warning on quiet
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-07-07 16:00:08 -07:00
Tibor Vass efcf24f0c4 Merge pull request #24156 from Microsoft/jjh/clearbasefs
Windows: Clear volume path for Hyper-V containers
2016-07-07 15:35:14 -07:00
Stefan J. Wernli 3e109f349f Removing Custom Images support
Now that Windows base images can be loaded directly into docker via "docker load" of a specialized tar file (with docker pull support on the horizon) we no longer have need of the custom images code path that loads images from a shared central location.  Removing that code and it's call points.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-07-07 14:56:37 -07:00
Sebastiaan van Stijn 1255e53e28
add iptables=false to docs for multiple daemons
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-07 14:54:44 -07:00
Sebastiaan van Stijn b98ba9a1d6 Merge pull request #24291 from vdemeester/docs-cli-reference-updates
Updates on cli reference documentation
2016-07-07 14:28:54 -07:00
Justin Cormack 6dfba780cc Fix test case for docker_api_swarm_test.go
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 21:01:55 +01:00
Justin Cormack d428a7a425 Update swarmkit vendoring
Needed for libnetwork vendoring

Update Secret API name change correspondingly

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 21:01:54 +01:00
Justin Cormack 3ae0c66450 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>
2016-07-07 21:01:41 +01:00