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

25603 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Vincent Demeester
f4cfc6b983
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>
 2016-07-07 20:43:18 +02:00
Tõnis Tiigi
db67db98d8 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default 
Generate a swarm joining secret if none is specified
 2016-07-07 11:43:08 -07:00
Sebastiaan van Stijn
6167a9ab16 Merge pull request #22868 from Microsoft/jjh/dockerfilecmd 
Windows: CMD not honouring arg escaping
 2016-07-07 09:21:26 -07:00
Sebastiaan van Stijn
ace1f176fe Merge pull request #24369 from vdemeester/24356-on-failure-inconsistency 
Use "on-failure" for both containers and services
 2016-07-07 08:22:59 -07:00
Justin Cormack
d37a7394ac Add ltdl dependencies for aarch64 
Fixes `make test` and fix #24380 on aarch64

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-07 13:02:19 +01:00
Justin Cormack
0682468431 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>
 2016-07-07 12:53:39 +01:00
Vincent Demeester
a859a33647
Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-07 11:32:19 +02:00
Vincent Demeester
6ec4a640de
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-07 11:32:09 +02:00
Vincent Demeester
656c66dd50 Merge pull request #24383 from anusha-ragunathan/not-plugin 
Detect non-plugin content during install and error out.
 2016-07-07 11:18:27 +02:00
Vincent Demeester
50674ec107 Merge pull request #24053 from cpuguy83/mounts_default_writable 
Change defaults for mount writable and volume copying
 2016-07-07 11:18:14 +02:00
Sebastiaan van Stijn
f85a231c5f Merge pull request #24330 from avsm/endpoint-cli-typo 
make `docker service --help` text for `--endpoint-mode` more consistent
 2016-07-07 00:24:03 -07:00
Sebastiaan van Stijn
cd53e75c89 Merge pull request #24401 from yongtang/07052016-node-list-docs-HOSTNAME 
Change NAME to HOSTNAME in docs for `docker node ls`
 2016-07-06 22:49:34 -07:00
Yong Tang
668b8a998f Change NAME to HOSTNAME in docs for docker node ls 
In #24159, the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.

This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.

This fix is related to #24159 and #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-06 20:23:53 -07:00
Brian Goff
28e9d93f52 Merge pull request #24361 from coolljt0725/add_ip_ping 
Install iproute2 and iputils-ping in Dockerfile.aarch64
 2016-07-06 22:51:34 -04:00
Brian Goff
56f3422468 Use newer default values for mounts CLI 
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-07-06 22:34:39 -04:00
Anusha Ragunathan
d32df6d934 Detect non-plugin content during install and error out. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-07-06 18:49:39 -07:00
Brian Goff
db271b8833 re-vendor swarmkit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-07-06 21:14:14 -04:00
Brian Goff
140ec59db6 re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-07-06 21:14:14 -04:00
Brian Goff
a04a11f3e5 Merge pull request #24373 from floatingLomas/zsh-completion-fix 
Remove unmatched bracket from _docker for zsh
 2016-07-06 16:54:16 -04:00
Aaron Lehmann
7342e42fce Generate a swarm joining secret if none is specified 
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.

This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.

`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.

Closes #23785

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-06 13:04:50 -07:00
Alexander Morozov
6f052edcc0 Merge pull request #24133 from cpuguy83/hacky_swarm_integration_tests 
Implement service integration tests
 2016-07-06 11:49:27 -07:00
Lei Jitang
276e234ca0 Install iproute2 and iputils-ping in Dockerfile.aarch64 
ping and ip command are need in integration-cli test, but
they are missing in ubuntu:wily.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-06 16:48:51 +00:00
Vincent Demeester
6bf357561f Merge pull request #24363 from runcom/fix-cross-push-digests 
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
 2016-07-06 18:17:51 +02:00
Jonathan Lomas
7631dc80a6
Remove unmatched bracket from _docker for zsh 
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
 2016-07-06 08:57:28 -07:00