Commit Graph

31121 Commits

Author SHA1 Message Date
Vincent Demeester 42f5ad3701 Use default driver for IPAM if none
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c3220641274bb99e120a1b3dd64078f02589717b
Component: engine
2017-02-01 15:54:56 +01:00
Jim Minter 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
allencloud f0ff2a48ad sort volume drivers and auth plugins in info response
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1d1362bdb2fd8ddbcb0e3bf10afc25c346c023ea
Component: engine
2017-02-01 12:01:49 +08:00
Xinbo Weng 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
Sebastiaan van Stijn 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
John Mulhausen 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
Steve Dougherty 930514543b Replace "kickass" in name generator with "vigorous"
Having curse words in container names can get awkward.

Closes #30374.

Signed-off-by: Steve Dougherty <steve@asksteved.com>
Upstream-commit: 2b30a79d9e33806242de68ff3f1e2d02ec0ed4ed
Component: engine
2017-01-31 21:33:23 -05:00
Victor Vieux 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
John Howard 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
Tibor Vass 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
Matt Moore b79ceebd76 Add tracking to elided layer pulls.
Signed-off-by: Matt Moore <mattmoor@google.com>
Upstream-commit: d5482089bfd0348ed886be9f89c4d6b177cc6dce
Component: engine
2017-01-31 16:36:17 -08:00
Victor Vieux 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
jroenf 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
Kenfe-Mickael Laventure 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
Yong Tang b0eb082cb1 Use binary frame for websocket attach endpoint
This fix tries to address the issue raised in 28176 where
text frame was used in websocket attach endpoint. In case
the data send out contains non utf8 data, the connection
will be closed in certain browsers, e.g., Safari.

This fix address the issue by change `PayloadType` to `BinaryFrame`.

This fix is tested manually with Safari. The docker daemon is inside a Linux Virtual Machine.

Create a container with:
```
docker run -itd --name websocket busybox sh -c "while true; do echo -e 'he\\xc3\\x28o'; sleep 5; done"
```

Use the following url (172.16.66.128:2375 is the tcp address of the daemon):
```
file:///websocket.html?url=ws://172.16.66.128:2375/v1.25/containers/websocket/attach/ws?logs=1&stderr=1&stdout=1&stream=1&stdin=1
```

and the following html:
```
<!DOCTYPE html>
<html lang="en">
<head>
  <meta charset="utf-8">
  <title>Websocket</title>
  <script type="text/javascript">
    function DockerWebSocket() {
      if ("WebSocket" in window) {
        console.log("WebSocket is supported by Browser...")
        // Remove '?url=' prefix
        url = window.location.search.replace(/^(\?url=)/,"");
        console.log("URL ["+url+"]...");
        var ws = new WebSocket(url);
        ws.onopen = function() {
          console.log("Connection is opened...");
        };
        ws.onclose = function() {
          console.log("Connection is closed...");
        };
        ws.onmessage = function (e) {
          if (typeof e.data === "string") {
            alert("WebSocket received text message ["+e.data+"]!")
          } else {
            console.log("Message is received...")
            var blobReader = new FileReader();
            blobReader.onload = function(event) {
              console.log(JSON.stringify(blobReader.result))
            };
            blobReader.readAsText(e.data)
            console.log("Message complete...")
          }
        };
      } else {
        alert("WebSocket is not supported by Browser!");
      }
    }
  </script>
</head>
<body>
  <div>
    <a href="javascript:DockerWebSocket()">Run DockerWebSocket</a>
  </div>
</body>
</html>
```

This fix fixes 28176.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e82dcaab520cb5676091f31d90614d3988a725e4
Component: engine
2017-01-31 14:04:32 -08:00
DiSiqueira 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
Alexander Morozov 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
Phil Estes 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
Alexander Morozov 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
Vincent Demeester 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
Alexander Morozov 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
Alexander Morozov 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
Sebastiaan van Stijn 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
Nathan LeClaire 69bb836a1f Remove --init-path mention
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 241173b3b950fa17667f76bbd720fac9e04653b6
Component: engine
2017-01-31 09:50:55 -08:00
Christopher Jones 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Joffrey F 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
Sebastiaan van Stijn 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
Alexander Morozov 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
Victor Vieux 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
Christopher Jones 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
Tianon Gravi 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
Alexander Morozov 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
Vincent Demeester 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
Yong Tang 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
Yong Tang 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
Yong Tang 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
Anusha Ragunathan 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
Alexander Morozov 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
Darren Stahl 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
Tibor Vass 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
Tibor Vass 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
Tõnis Tiigi 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
Alexander Morozov 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
Daniel Nephin 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