Commit graph

30638 commits

Author SHA1 Message Date
Vincent Demeester
c322064127
Use default driver for IPAM if none
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-01 15:54:56 +01:00
Vincent Demeester
8f8c4f20e3 Merge pull request #30614 from Microsoft/jjh/vendorgowinio
Revendor Microsoft/go-winio v0.3.8
2017-02-01 09:52:55 +01:00
Vincent Demeester
1de72681b5 Merge pull request #30619 from johndmulhausen/patch-3
Fix for 404 in docs
2017-02-01 09:50:11 +01:00
Vincent Demeester
60f8f3fd64 Merge pull request #30615 from tiborvass/plugin_errors
plugin: use pkg/errors in more places
2017-02-01 09:44:19 +01:00
Vincent Demeester
deb0885419 Merge pull request #30620 from thaJeztah/carry-29590
some grammatical errors
2017-02-01 09:40:17 +01:00
Xinbo Weng
5b258f6ac2
some grammatical errors
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-31 19:33:12 -08:00
Sebastiaan van Stijn
36db5f6f68 Merge pull request #30011 from davidwilliamson/patch-1
Provide password to volume create command
2017-01-31 19:20:30 -08:00
John Mulhausen
3c3456885d Fix for https://github.com/docker/docker.github.io/issues/1413
Signed-off-by: John Mulhausen <john@docker.com>
2017-01-31 18:59:21 -08:00
Victor Vieux
6365d8dd19 Merge pull request #30578 from tophj-ibm/add-p-z-to-release-deb
[ppc64le/s390x] add p/z to release-deb
2017-01-31 17:39:17 -08:00
John Howard
da6739c99f Revendor Microsoft/go-winio v0.3.8
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-31 16:46:59 -08:00
Tibor Vass
26d0bac895 plugin: use pkg/errors in more places
Also provide stack trace output in daemon logs.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-01-31 16:45:26 -08:00
Victor Vieux
2b412120b6 Merge pull request #30608 from mlaventure/update-containerd
Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
2017-01-31 16:34:50 -08:00
Alexander Morozov
052f593530 Merge pull request #30607 from jroenf/patch-1
Fix syntax in label example
2017-01-31 14:55:13 -08:00
jroenf
ada374f316 Fix syntax in example
Signed-off-by: Jeroen Franse <jeroenfranse@gmail.com>
2017-01-31 23:51:06 +01:00
Kenfe-Mickael Laventure
50886f49b9 Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-31 14:36:51 -08:00
Alexander Morozov
ebaf1ced72 Merge pull request #27071 from rhvgoyal/docker-overlay-error
Warn if kernel does not support overlay with selinux
2017-01-31 13:41:02 -08:00
Phil Estes
feb8b1c581 Merge pull request #30506 from vdemeester/29732-follow-up-compose-indempotent
Make docker stack deploy a little bit more indempotent
2017-01-31 13:35:04 -08:00
Alexander Morozov
1d2f5de49a Merge pull request #30162 from yongtang/29972-service-read-only
Add `--read-only` for `service create` and `service update`
2017-01-31 13:20:00 -08:00
Vincent Demeester
818ef47394 Merge pull request #30484 from yongtang/28199-shorten
Add `truncate` function for Go templates
2017-01-31 21:56:21 +01:00
Alexander Morozov
048fc98c09 Merge pull request #30411 from thaJeztah/fix-build-from-local-github-directories
do not ignore local build-contexts starting with "github.com"
2017-01-31 12:45:11 -08:00
Alexander Morozov
0fbff69ab0 Merge pull request #30603 from tophj-ibm/fix-systemd-dropin-link
Update systemd drop-in link
2017-01-31 12:30:16 -08:00
Sebastiaan van Stijn
229625cd47 Merge pull request #30570 from anusha-ragunathan/doc_update
Add docs for service create based on plugins.
2017-01-31 12:05:04 -08:00
Christopher Jones
7c763b360a
Update systemd drop-in link
Right now it redirects, so change it to the correct one.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-31 12:31:00 -05:00
Vincent Demeester
9c94fa4563 Merge pull request #30582 from shin-/fix-network-prune-swagger-typo
Fix typo in swagger.yaml for NetworkPrune operation
2017-01-31 11:27:47 +01:00
Vincent Demeester
b61fe846b1 Merge pull request #30510 from albers/completion-swarm-logs
Add bash completion for `docker service logs`
2017-01-31 11:10:48 +01:00
Vincent Demeester
c0a1d2e0d8 Merge pull request #30117 from msabansal/natfix
Added support for dns-search and fixes #30102
2017-01-31 11:05:29 +01:00
Joffrey F
20c5fa3758 Fix typo in swagger.yaml for NetworkPrune operation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:25:39 -08:00
Sebastiaan van Stijn
a51c17f90b Merge pull request #30576 from vieux/more_rebuild_labels
add powerpc and z to rebuild labels
2017-01-30 18:11:04 -08:00
Alexander Morozov
cdc79c54ec Merge pull request #28968 from darrenstahlmsft/TestEventsLimit
Limit TestEventsLimit to 4 concurrent containers on Windows
2017-01-30 15:09:54 -08:00
Victor Vieux
8304f30271 add powerpc and z to rebuild labels
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-01-30 14:54:17 -08:00
Christopher Jones
9db1d16053
[ppc64le/s390x] add p/z to release-deb
This adds ppc64le and s390x architectures to those supported
by hack/make/release-debs

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-30 17:44:33 -05:00
Tianon Gravi
1202592f6e Merge pull request #30480 from flx42/install-debian-stretch-support
install: map debian_version 9.X to debian stretch
2017-01-30 13:59:44 -08:00
Alexander Morozov
3e6712a6ef Merge pull request #30521 from dnephin/cleanup-compose-loader
`cli/compose` cleanup - remove the old loading system
2017-01-30 13:55:23 -08:00
Vincent Demeester
04f0e616f2 Merge pull request #30542 from skabashnyuk/master
Fixes work of inspectResponse in case of ContentLength=-1
2017-01-30 22:54:49 +01:00
Yong Tang
7fa8d5e064 Add truncate function for Go templates
This fix is part of the discussion in 28199 about using
`truncate` to replace `--no-trunc`.

As part of the fix, a new function `truncate` has been
added for Go templates so that it is possible to use
```
docker stack services --format "{{truncate .ID 5}}: {{.Mode}} {{.Replicas}}"
```
to show truncated ID.

A unit test has been added.

This fix is related to 28199.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-30 13:33:16 -08:00
Yong Tang
885e1f250a Update bash and zsh completion for service create/update --read-only
This commit updates bash and zsh completion for flag `--read-only`
in `service create/update`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-30 13:21:25 -08:00
Yong Tang
499a0dd43e Add --read-only for service create and service update
This fix tries to address the issue raised in 29972 where
it was not possible to specify `--read-only` for `docker service create`
and `docker service update`, in order to have the container's root file
system to be read only.

This fix adds `--read-only` and update the `ReadonlyRootfs` in `HostConfig`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 29972.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-30 12:47:26 -08:00
Anusha Ragunathan
62d399e811 Add docs for service create based on plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-01-30 12:34:20 -08:00
Alexander Morozov
a08da82a28 Merge pull request #30186 from thaJeztah/add-version-annotation-to-flags
Add version annotation to various flags added in 1.13
2017-01-30 12:33:36 -08:00
Darren Stahl
2ec808ec08 Limit TestEventsLimit to 4 concurrent containers on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-01-30 11:04:52 -08:00
Tibor Vass
01e03cb85b Merge pull request #30545 from justincormack/arm-seccomp
Add two arm specific syscalls to seccomp profile
2017-01-30 10:47:09 -08:00
Tibor Vass
a88e529d28 Merge pull request #30489 from unclejack/bump_go_to_1.7.5
Dockerfile*: bump Go to 1.7.5
2017-01-30 10:32:55 -08:00
Tõnis Tiigi
61b2cda9f5 Merge pull request #27083 from RobSkye/25935-show-apparmor-default-profile-in-docker-inspect
Docker inspect "AppArmorProfile" field now shows "docker-default" when AppArmor is enabled and no other profile was defined
2017-01-30 10:05:52 -08:00
Alexander Morozov
61198b5ea3 Merge pull request #30548 from yongtang/vendor-swarmkit
Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
2017-01-30 09:41:08 -08:00
Daniel Nephin
9931cb045d Merge pull request #30534 from allencloud/remove-cli-command-secret-util
remove cli/command/secrets/utils.go
2017-01-30 12:28:45 -05:00
Daniel Nephin
d542f3e57c Merge pull request #30246 from vdemeester/integration-remove-utils
[test-integration] Remove most of the runCommandWithOutput
2017-01-30 10:37:51 -05:00
ROBERTO MUÑOZ
d97a00dfd5 Added an apparmorEnabled boolean in the Daemon struct to indicate if AppArmor is enabled or not. It is set in NewDaemon using sysInfo information.
Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

Added an apparmorEnabled boolean in the Daemon struct to indicate if AppArmor is enabled or not. It is set in NewDaemon using sysInfo information.

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

gofmt'd

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

change the function name to something more adequate and changed the behaviour to show empty value on an apparmor disabled system.

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

go fmt

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>
2017-01-30 16:23:23 +01:00
Vincent Demeester
ecbb0e62f6 Remove most of the runCommandWithOutput from integration tests
There is 5 calls left, that use StdinPipe that is not yet supported by
icmd.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-30 10:54:06 +01:00
Sergii Kabashniuk
28d59e57ca Added test for the case if ContentLength = -1
Signed-off-by: Sergii Kabashniuk <skabashnyuk@codenvy.com>
2017-01-30 10:05:05 +02:00
Harald Albers
105231556a Add bash completion for docker service logs
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-29 22:29:07 -08:00