Commit graph

30308 commits

Author SHA1 Message Date
Sebastiaan van Stijn
a4bc730298 Merge pull request #30108 from thaJeztah/update-changelog-1.12.6
Update changelog on master with changes from 1.12.x
2017-01-14 18:11:45 +01:00
Brian Goff
60fb79e0dc Merge pull request #30150 from anusha-ragunathan/pluginv1_vol
Fix pluginv1 Windows volumes
2017-01-14 11:35:05 -05:00
Doug Davis
b65f7ea7ae Merge pull request #30164 from xulike666/fix-typo-5/36
fix typo in container/container.go
2017-01-14 09:14:52 -05:00
Brian Goff
1bbd75c743 Merge pull request #30125 from albers/completion-plugin-install--disable-content-trust
Add bash completion for `plugin install --disable-content-trust`
2017-01-14 09:04:51 -05:00
Brian Goff
78db6379a8 Merge pull request #30103 from TDAbboud/29961-add-error-checking
Add error checking for hostPort range
2017-01-14 08:43:27 -05:00
Brian Goff
728566c4ad Merge pull request #30161 from xulike666/fix-typo-4/36
fix typo in api/types/client.go
2017-01-14 08:24:49 -05:00
Brian Goff
1847f855b3 Merge pull request #30160 from xulike666/fix-boring-typo
fix typo in api/types/time/timestamp.go
2017-01-14 08:22:31 -05:00
Aaron.L.Xu
32035ffea5 fix typo in container/container.go
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-01-14 15:23:33 +08:00
Aaron.L.Xu
c8fd28f12e fix typo in api/types/client.go
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-01-14 15:10:08 +08:00
Aaron.L.Xu
2859ce6a57 fix typo in api/types/time/timestamp.go
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-01-14 14:16:03 +08:00
Anusha Ragunathan
0ef21eb0e3 Fix pluginv1 Windows volumes
c54b717 caused a regression for pluginv1 on Windows, where extraneous
backslashes were added to BasePath of the plugin. For pluginv1 on windows,
BasePath() should return an empty string, since the plugin is fully aware
of the mount path. Also, unlike Linux where all paths are relative to "/",
Windows paths are dependent on system drives and mapped drives.

Fixes #30148

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-01-13 17:01:48 -08:00
Tony Abboud
135f8f9674 Add error checking for hostPort range
This fix catches the case where there is a single container port
and a dynamic host port and will fail out gracefully
Example docker-compose.yml snippet:
    port:
        ports:
            - "8091-8093:8091"
            - "80:8080"

Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
2017-01-13 18:05:51 -05:00
Alexander Morozov
1eafa0f706 Merge pull request #30112 from Microsoft/jjh/graphdriver
Windows: Remove redundant 'GraphDriver() func
2017-01-13 13:59:12 -08:00
Vincent Demeester
bd9361b810 Merge pull request #28720 from jlhawn/add_secret_update_method
Add SecretUpdate method to client
2017-01-13 21:28:43 +01:00
Sebastiaan van Stijn
ca00c18530 Merge pull request #30131 from xulike666/fix-typo
fix typo in mount.go
2017-01-13 20:40:34 +01:00
Josh Hawn
1cd5af59bf Add SecretUpdate docs to api/swagger.yaml
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-01-13 09:51:12 -08:00
Josh Hawn
77b8465d7e Add SecretUpdate method to client
closes #28678

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

Update cli/command/service/update_test.go

Fixes test build error:

  secretAPIClientMock does not implement "github.com/docker/docker/client".SecretAPIClient (missing SecretUpdate method)

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-01-13 09:51:05 -08:00
Kenfe-Mickaël Laventure
f858d49483 Merge pull request #30120 from thaJeztah/revert-argument-name-change
revert "virtualSize" name change
2017-01-13 08:54:27 -08:00
Sebastiaan van Stijn
2dd3aa608d Merge pull request #30132 from albers/completion_hide_legacy_commands
Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion
2017-01-13 16:18:58 +01:00
Vincent Demeester
8b7ba17d33 Merge pull request #30130 from ijc25/clarify-cp-docs
Clarify `cp` documentation behaviour with trailing "/."
2017-01-13 16:16:03 +01:00
Harald Albers
aa006f1280 Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-13 15:43:52 +01:00
Aaron.L.Xu
e0621c53af fix typo in mount.go
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-01-13 22:36:32 +08:00
Ian Campbell
fca6cda4b0 Clarify cp documentation behaviour with trailing "/."
Issue #30082 demonstrated that their is possible confusion with the "/."
where the tailing "." can appear to be merely punctuation within the
document rather than a highly pertinent part of `SRC_PATH`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-01-13 13:58:25 +00:00
Harald Albers
725a864a04 Add bash completion for plugin install --disable-content-trust
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-13 11:56:50 +01:00
Sebastiaan van Stijn
22c411517a
revert "virtualSize" name change
Commit b717de5153
changed the name of the "size" argument to
"virtualSize", as the "VirtualSize" field
was re-used for calculating the size of all
layers _not_ used by other images.

be20dc15af reverted
the change in calculation, but did not change
the argument name back to "size".

This changes the name back to its original
name, because since the introduction of the
content-addressable store in docker 1.10,
there no longer is a "virtual" size, so
"size" is a better name for this argument.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-13 10:25:03 +01:00
Sebastiaan van Stijn
0b09d6bfa7 Merge pull request #30061 from yongtang/30027-docker-images-v1.12
Fix `Size` in `docker images` for v1.12 client to v1.13 daemon
2017-01-13 02:11:48 +01:00
Brian Goff
597843e790 Merge pull request #30039 from ripcurld0/specify_line_no_dockerfile_err
Specify in which line the Dockerfile parser failed
2017-01-12 19:48:45 -05:00
John Howard
2cd8bcd7df Windows: Remove redundant 'GraphDriver() func
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-12 15:32:46 -08:00
Michael Crosby
f65212d5b9 Merge pull request #30106 from runcom/fix-upgrade-from-1.10
daemon: honor default runtime when starting containers
2017-01-12 14:44:37 -08:00
Antonio Murdaca
9391a822ea
daemon: honor default runtime when starting containers
If you created containers from pre-OCI docker (e.g. docker-1.10.x)
upgrade may fail when restarting containers if the new docker daemon
has `--default-runtime` set.

In Fedora, we ship docker 1.12.6 with:

```
--default-runtime=oci
--add-runtime oci=/usr/libexec/docker/docker-runc-current
```

That way we don't rely on `docker-runc` being in `$PATH`.

The issue is, on upgrade from docker 1.10.3 without this patch, the
default runtime in `daemon/start_linux.go` is unconditionally set to
`runc=docker-runc` without honoring the `--default-runtime` flag set in
the docker daemon.

Reproducer:

- (1.10.3) `docker run -d -p 5000:5000 --restart=always --name registry
registry:2`
- upgrade to docker 1.12.6 (1.11.x has likely the same issue)
- the registry container fails to restart on upgrade with the following
log message `error="exec: \"docker-runc\": executable file not
found in $PATH: \"\""`

That error comes from the fact that we're setting the runtime in the
container's HostConfig to `runc` where instead we should have honored
the `--default-runtime` flag (in our case that's set to `oci`).

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-01-12 20:36:22 +01:00
Tõnis Tiigi
27695cd751 Merge pull request #27903 from kim0/master
zfs: expose mountpoint/dataset on inspection
2017-01-12 11:28:07 -08:00
Kenfe-Mickael Laventure
5e28d20e63 Bump version to 1.12.6
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 94dfa20066)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 20:00:34 +01:00
Tibor Vass
2a202ea4aa Merge pull request #29466 from vieux/bump_1.12.5
bump to 1.12.5
(cherry picked from commit 7392c3b0ce)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:59:39 +01:00
Victor Vieux
650b381991
update changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 0e5346df32)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:59:11 +01:00
Victor Vieux
ef39dad14a
add networking fox to changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit f6fbe58fbe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:59:02 +01:00
Victor Vieux
c8ece052c1 Merge pull request #29379 from vieux/1.12.5-rc1_bump
1.12.5-rc1 bump
(cherry picked from commit 02394deb34)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:58:50 +01:00
Victor Vieux
dee2748483 Merge pull request #29338 from vieux/bump_1.12.4_version
bump version to 1.12.4
(cherry picked from commit 1564f02e33)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:57:41 +01:00
Victor Vieux
603ea0682f
update changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 0d5bc84d06)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:56:29 +01:00
Victor Vieux
8dfd1919f5 Merge pull request #29204 from andrewhsu/changelog-date
[1.12.x] added date after version number in changelog
(cherry picked from commit 4a13581d57)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:56:01 +01:00
Victor Vieux
6c7a449aa5 Merge pull request #29187 from vieux/1.12.4-changelog
bump version and changelog for 1.12.4-rc1
(cherry picked from commit caa6b86f38)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-12 19:54:57 +01:00
Kenfe-Mickaël Laventure
f018c0dfff Merge pull request #30088 from tonistiigi/fifo-close-early
Close stdout/stderr fifo as soon as possible
2017-01-12 09:29:39 -08:00
Vincent Demeester
06e3812b6e Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group
Don't encourage adding user to docker group
2017-01-12 18:28:16 +01:00
Vincent Demeester
e880120fe2 Merge pull request #28500 from rhvgoyal/remove-unused-param
devmapper: get rid of unused device id argument in unregisterDevice()
2017-01-12 18:02:00 +01:00
Vincent Demeester
1d40e9cb18 Merge pull request #27928 from erikh/fix-docs
api/types/client.go: documentation fix for ImageImportSource
2017-01-12 17:36:36 +01:00
Yong Tang
d9451f1c8c Add test for image size for v1.12 and v1.13 clients against v1.13 daemon
This test checks to make sure both v1.12 and v1.13 client against v1.13 daemon get correct `Size` after the fix.

This test is related to 30027.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-12 08:12:39 -08:00
Kenfe-Mickael Laventure
be20dc15af Fix ImageSummary.Size value
The prune PR changed the meaning of the file to mean "space on disk
only unique to this image", this PR revert this change.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-12 07:49:22 -08:00
Boaz Shuster
8f282cdea5 Specify in which line the Dockerfile parser failed
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-01-12 17:45:45 +02:00
Brian Goff
bf71db7a12 Merge pull request #30010 from thaJeztah/master-revert-27146
Revert "Require continuation char to be last char in a line"
2017-01-12 09:17:08 -05:00
Sebastiaan van Stijn
af5323f958 Merge pull request #30077 from tonistiigi/fix-test-leaks
Fix leaked connections in integration tests
2017-01-12 11:35:02 +01:00
John Howard
e48937fb99 Merge pull request #30085 from swernli/skip_push_base
storeLayer.Parent should return describableStoreLayers
2017-01-11 23:37:50 -08:00