313335dc3d
Merge pull request #22563 from mlaventure/cgroup-devices
...
Allow adding rules to cgroup devices.allow on container create/run
Upstream-commit: 27f90acd61f4937f1f722082793e806261e527f7
Component: engine
2017-02-01 16:29:34 +01:00
79aad07ab6
Merge pull request #30446 from jim-minter/attachrace
...
Resolve race conditions in attach API call
Upstream-commit: caa78da1c6f1337d3b1e638e2e77dd840734f6ed
Component: engine
2017-02-01 16:20:50 +01:00
5c89c83d5a
Merge pull request #30537 from DiSiqueira/asserting_error
...
Underscoring an unused var in tests
Upstream-commit: e66717e9f8a8197ae7b25ecd5465b2ef8b47d56c
Component: engine
2017-02-01 16:08:20 +01:00
d66ad9dfab
Resolve race conditions in attach API call
...
Signed-off-by: Jim Minter <jminter@redhat.com >
Upstream-commit: 84d6240cfe7cc66a7d3f6ac78ea6faad0e3108b9
Component: engine
2017-02-01 09:01:36 +00:00
2dd65c05da
Merge pull request #30614 from Microsoft/jjh/vendorgowinio
...
Revendor Microsoft/go-winio v0.3.8
Upstream-commit: 8f8c4f20e39def31be57feb8913c676d49c96b47
Component: engine
2017-02-01 09:52:55 +01:00
f43ab01087
Merge pull request #30619 from johndmulhausen/patch-3
...
Fix for 404 in docs
Upstream-commit: 1de72681b598003eb186011237639bbfc4f67318
Component: engine
2017-02-01 09:50:11 +01:00
5fe34ca57b
Merge pull request #30615 from tiborvass/plugin_errors
...
plugin: use pkg/errors in more places
Upstream-commit: 60f8f3fd64b0bfd69ca655e03d16489e9ac9fb38
Component: engine
2017-02-01 09:44:19 +01:00
f765025408
some grammatical errors
...
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5b258f6ac24a4eff83561be8a9707d7762b32ade
Component: engine
2017-01-31 19:33:12 -08:00
26a4c3bcea
Merge pull request #30011 from davidwilliamson/patch-1
...
Provide password to volume create command
Upstream-commit: 36db5f6f6895d62a04e509ad958fe3566d5780ba
Component: engine
2017-01-31 19:20:30 -08:00
8c4159ea41
Fix for https://github.com/docker/docker.github.io/issues/1413
...
Signed-off-by: John Mulhausen <john@docker.com >
Upstream-commit: 3c3456885d7309137146950302e7c0c34752143b
Component: engine
2017-01-31 18:59:21 -08:00
2bebca007d
Merge pull request #30578 from tophj-ibm/add-p-z-to-release-deb
...
[ppc64le/s390x] add p/z to release-deb
Upstream-commit: 6365d8dd19ba7a3483938458fa39eb43d716ba8d
Component: engine
2017-01-31 17:39:17 -08:00
bf18bba970
Revendor Microsoft/go-winio v0.3.8
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: da6739c99f7e6bf5036073a6c052e6c6d86a461b
Component: engine
2017-01-31 16:46:59 -08:00
83cd2e6903
plugin: use pkg/errors in more places
...
Also provide stack trace output in daemon logs.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 26d0bac8955903bc3a845358d159b2ec2f7c253f
Component: engine
2017-01-31 16:45:26 -08:00
0a192293c1
Merge pull request #30608 from mlaventure/update-containerd
...
Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
Upstream-commit: 2b412120b61120f631d67aac5f397629ec813d7f
Component: engine
2017-01-31 16:34:50 -08:00
0bceafbfa1
Fix syntax in example
...
Signed-off-by: Jeroen Franse <jeroenfranse@gmail.com >
Upstream-commit: ada374f316579e55d5a350f4e9a1e5674af95106
Component: engine
2017-01-31 23:51:06 +01:00
a485c34f6a
Update containerd to version 78fb8f45890a601e0fd9051cf9f9f74923e950fd
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 50886f49b9a4334790f6dc1f3d6d23ebd772c25e
Component: engine
2017-01-31 14:36:51 -08:00
9601f4ac96
I found out this err var isn't being used, so underscoring it to preserve resources
...
Signed-off-by: DiSiqueira <dieg0@live.com >
Upstream-commit: 4bd1895241b7ad750f22b0ff18fd9a3eacfdb362
Component: engine
2017-01-31 19:48:15 -02:00
eeec4ed705
Merge pull request #27071 from rhvgoyal/docker-overlay-error
...
Warn if kernel does not support overlay with selinux
Upstream-commit: ebaf1ced72c8dbb09368000f6f778d299603baee
Component: engine
2017-01-31 13:41:02 -08:00
20b0782c41
Merge pull request #30506 from vdemeester/29732-follow-up-compose-indempotent
...
Make docker stack deploy a little bit more indempotent
Upstream-commit: feb8b1c5818c178a9d51f539c8afca7f0c759ac4
Component: engine
2017-01-31 13:35:04 -08:00
cc26ad0039
Merge pull request #30162 from yongtang/29972-service-read-only
...
Add `--read-only` for `service create` and `service update`
Upstream-commit: 1d2f5de49aad9f35e3fc3160693a07a86998d3dc
Component: engine
2017-01-31 13:20:00 -08:00
5bb8e3b327
Merge pull request #30484 from yongtang/28199-shorten
...
Add `truncate` function for Go templates
Upstream-commit: 818ef473944e8dbb39b7971b96ffdd6035d840ef
Component: engine
2017-01-31 21:56:21 +01:00
46d59f3006
Merge pull request #30411 from thaJeztah/fix-build-from-local-github-directories
...
do not ignore local build-contexts starting with "github.com"
Upstream-commit: 048fc98c09fb85b827f3caf69c460e9ad6aa095a
Component: engine
2017-01-31 12:45:11 -08:00
a45545b38c
Merge pull request #30603 from tophj-ibm/fix-systemd-dropin-link
...
Update systemd drop-in link
Upstream-commit: 0fbff69ab0f65dec966b8b5d814b9df59f7185da
Component: engine
2017-01-31 12:30:16 -08:00
f45ed1d138
Merge pull request #30570 from anusha-ragunathan/doc_update
...
Add docs for service create based on plugins.
Upstream-commit: 229625cd47bcdcdf420cee93d30005b4818590ca
Component: engine
2017-01-31 12:05:04 -08:00
44e3cd82ba
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 >
Upstream-commit: 7c763b360a08f9a079fd041cbe38ab71efc3cd11
Component: engine
2017-01-31 12:31:00 -05:00
ff9a2d1881
Merge pull request #30582 from shin-/fix-network-prune-swagger-typo
...
Fix typo in swagger.yaml for NetworkPrune operation
Upstream-commit: 9c94fa4563eb91e0a83f55d0025e2b0202528ce6
Component: engine
2017-01-31 11:27:47 +01:00
f1745ac875
Merge pull request #30510 from albers/completion-swarm-logs
...
Add bash completion for `docker service logs`
Upstream-commit: b61fe846b1659c482abd07b523b219c0b01419c0
Component: engine
2017-01-31 11:10:48 +01:00
b304d83344
Merge pull request #30117 from msabansal/natfix
...
Added support for dns-search and fixes #30102
Upstream-commit: c0a1d2e0d88ff3cae6802dfbd128c7739e8c2bcc
Component: engine
2017-01-31 11:05:29 +01:00
6d36757116
Fix typo in swagger.yaml for NetworkPrune operation
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 20c5fa37585b76fe41cb98163bc0b9df2a3e2ec3
Component: engine
2017-01-30 18:25:39 -08:00
ddafdab455
Merge pull request #30576 from vieux/more_rebuild_labels
...
add powerpc and z to rebuild labels
Upstream-commit: a51c17f90bdf8880504523f48781fd30b5810f25
Component: engine
2017-01-30 18:11:04 -08:00
8fc4505f3b
Merge pull request #28968 from darrenstahlmsft/TestEventsLimit
...
Limit TestEventsLimit to 4 concurrent containers on Windows
Upstream-commit: cdc79c54ec88a96a4c01728c0321826ae7c920e5
Component: engine
2017-01-30 15:09:54 -08:00
d876b651f4
add powerpc and z to rebuild labels
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 8304f30271e030c8f6b57198ff7f6f34d5d438f0
Component: engine
2017-01-30 14:54:17 -08:00
02217a3ce5
[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 >
Upstream-commit: 9db1d16053b9c94586d4233a1f4067eede24947e
Component: engine
2017-01-30 17:44:33 -05:00
1af61b4645
Merge pull request #30480 from flx42/install-debian-stretch-support
...
install: map debian_version 9.X to debian stretch
Upstream-commit: 1202592f6ed6b9093b1d079274522c7641fbf934
Component: engine
2017-01-30 13:59:44 -08:00
2002a67479
Merge pull request #30521 from dnephin/cleanup-compose-loader
...
`cli/compose` cleanup - remove the old loading system
Upstream-commit: 3e6712a6ef3ac7ed0e622544f4a99dbe2c40923c
Component: engine
2017-01-30 13:55:23 -08:00
666b6151bb
Merge pull request #30542 from skabashnyuk/master
...
Fixes work of inspectResponse in case of ContentLength=-1
Upstream-commit: 04f0e616f2472612e62ee27dd56c542c2f52afff
Component: engine
2017-01-30 22:54:49 +01:00
181d0eab7a
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 >
Upstream-commit: 7fa8d5e064bad6d65348a69b623ebb2ecffdf248
Component: engine
2017-01-30 13:33:16 -08:00
0b2ce29ccb
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 >
Upstream-commit: 885e1f250a7ad46da33ab554b1d57d5e0a663618
Component: engine
2017-01-30 13:21:25 -08:00
2af5a366ad
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 >
Upstream-commit: 499a0dd43e50c6f253f8890f5c54ae99675b1e7e
Component: engine
2017-01-30 12:47:26 -08:00
e21e183507
Add docs for service create based on plugins.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 62d399e8112caacad93829d8faa1c15dfc4f694c
Component: engine
2017-01-30 12:34:20 -08:00
c74a5fc7cf
Merge pull request #30186 from thaJeztah/add-version-annotation-to-flags
...
Add version annotation to various flags added in 1.13
Upstream-commit: a08da82a28848b4857e86b9a493143e9ac3fcee6
Component: engine
2017-01-30 12:33:36 -08:00
16640108c8
Limit TestEventsLimit to 4 concurrent containers on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 2ec808ec0822333f0807ee40916e3ba0e3b064ff
Component: engine
2017-01-30 11:04:52 -08:00
cfdc548475
Merge pull request #30545 from justincormack/arm-seccomp
...
Add two arm specific syscalls to seccomp profile
Upstream-commit: 01e03cb85b9cd77b78db88705780d77cd1c43507
Component: engine
2017-01-30 10:47:09 -08:00
74edba628c
Merge pull request #30489 from unclejack/bump_go_to_1.7.5
...
Dockerfile*: bump Go to 1.7.5
Upstream-commit: a88e529d28266a804e7b32bbce72ee18ececdddb
Component: engine
2017-01-30 10:32:55 -08:00
62197945dc
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
Upstream-commit: 61b2cda9f58a548bd62ac62c8896cfd7ccac6733
Component: engine
2017-01-30 10:05:52 -08:00
b9e6f00c54
Merge pull request #30548 from yongtang/vendor-swarmkit
...
Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
Upstream-commit: 61198b5ea38eb333d93f5eeebf66df1c820a8abd
Component: engine
2017-01-30 09:41:08 -08:00
abfd1e8fe4
Merge pull request #30534 from allencloud/remove-cli-command-secret-util
...
remove cli/command/secrets/utils.go
Upstream-commit: 9931cb045da4ad9ca6ec0db89993222a234b8612
Component: engine
2017-01-30 12:28:45 -05:00
d359ab9e02
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 >
Upstream-commit: d97a00dfd5ec884a98e087b1fc6e705459ca81e9
Component: engine
2017-01-30 16:23:23 +01:00
e290b2d1c4
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 >
Upstream-commit: ecbb0e62f66da7d698c4f4583f36b927d8cfa811
Component: engine
2017-01-30 10:54:06 +01:00
cee836fc39
Added test for the case if ContentLength = -1
...
Signed-off-by: Sergii Kabashniuk <skabashnyuk@codenvy.com >
Upstream-commit: 28d59e57ca0c718fe5d7531626be1fe3b9b6564a
Component: engine
2017-01-30 10:05:05 +02:00
