Граф коммитов

30404 Коммитов

Автор SHA1 Сообщение Дата
Alexander Morozov b0f9958d93 daemon: remove graphdb usage
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2017-01-17 13:52:48 +00:00
Sebastiaan van Stijn 8c7651998f Merge pull request #30094 from miaoyq/complete-opt-for-plugin-install
Complete the options for 'docker plugin install'
2017-01-17 14:40:31 +01:00
Vincent Demeester 4fdfcb36cd Merge pull request #30138 from vdemeester/integration-use-testenv
[test-integration] Use testEnv methods and remove most of the global variables
2017-01-17 14:31:49 +01:00
Vincent Demeester 8518965d18 Merge pull request #29329 from thaJeztah/fix-fqdn-hostname
Add test for fqdn hostname not being set in container
2017-01-17 14:31:29 +01:00
Sebastiaan van Stijn 57de634bf3
Add new curators to MAINTAINERS
The Docker Captains are going to assist in our
triage process! \o/ \o/

This change adds the captains to the maintainers
file as a curator.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-17 14:31:24 +01:00
Zhang Wei 062ce13e9c Add missing ${DOCKER_BUILD_ARGS}
Add missing "${DOCKER_BUILD_ARGS}" for building rpm with `docker build`,
this is quite important when running `make rpm` behind http proxy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-01-17 20:10:48 +08:00
Vincent Demeester c8016e669f
Use testEnv methods and remove most of the global variables
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-17 12:39:08 +01:00
Vincent Demeester 9ebb90883e Merge pull request #30200 from albers/completion-build--squash
Add bash completion for `build --squash`
2017-01-17 12:07:00 +01:00
Sebastiaan van Stijn 950792dc6d add integration test for FQDN hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-17 11:01:59 +01:00
allencloud 3f1feaf4d6 purify error message in cli for create and run command
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-17 17:21:17 +08:00
Sebastiaan van Stijn 05378f4898 Merge pull request #30204 from YuPengZTE/devSem
fix the bare url and the Summary of http://semver.org
2017-01-17 10:04:33 +01:00
Jorge Marin 2bee1cfd5a Use quoted form of container name and container id
Use quoted form of container name and container id to improve copy-paste avoiding the extra `.` that slips into the clipboard

Signed-off-by: Jorge Marin <chipironcin@users.noreply.github.com>
2017-01-17 08:26:05 +00:00
yupengzte 1f925d1d5c fix the bare url and the Summary of http://semver.org
Signed-off-by: yupengzte <yupeng36@zte.com.cn>
2017-01-17 16:20:11 +08:00
Harald Albers e91dbba7ff Add bash completion for `build --squash`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-17 08:52:18 +01:00
Kenfe-Mickaël Laventure a7c3389a82 Merge pull request #30181 from albers/completion--filter-until
Add bash completion for `container|image|network prune --filter until`
2017-01-16 08:47:34 -08:00
Brian Goff e74623d283 Merge pull request #30113 from thaJeztah/fix-autoremove-on-older-api
Don't use AutoRemove on older daemons
2017-01-16 08:40:00 -05:00
Harald Albers 217786423c Add bash completion for `container|image|network prune --filter until`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-16 10:47:52 +01:00
Akihiro Suda dcf1264f1c Merge pull request #30058 from vdemeester/integration-build-cmd-clean
[test-integration] clean docker_cli_build_test.go
2017-01-16 18:16:49 +09:00
Vincent Demeester fd0ea76931 Merge pull request #30163 from albers/completion-fix-hide-legacy-commands
Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
2017-01-16 10:01:44 +01:00
Vincent Demeester ead8ce2431 Merge pull request #30151 from tonistiigi/fix-defunct
Avoid defunct registry/notary processes during tests
2017-01-16 08:55:16 +01:00
Sebastiaan van Stijn 582c5b7652 Merge pull request #30140 from mlaventure/remove-fifo-timeout
Remove timeout on fifos opening
2017-01-15 22:47:30 +01:00
Vincent Demeester fa4f09194f Merge pull request #28690 from zteBill/volume-errorinfo-inexact
repeated volume create information
2017-01-15 17:10:27 +01:00
Vincent Demeester c778f4b964
Refactor docker_cli_build_test.go
Use `testutil/cmd` for `buildCommand`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-15 16:48:08 +01:00
Sebastiaan van Stijn 96f7cf254b Merge pull request #30143 from tophj-ibm/multi-get-go-from-own-dockerfile
[multi-arch] get go version from arch dockerfile
2017-01-15 15:47:55 +01:00
Sebastiaan van Stijn 957a77f2e2 Merge pull request #30169 from runcom/fix-quoting
image: tarexport: do not quote integers in format string
2017-01-15 15:47:34 +01:00
Sebastiaan van Stijn 0ea7b143b0
Don't use AutoRemove on older daemons
Docker 1.13 moves the `--rm` flag to the daemon,
through an AutoRemove option in HostConfig.

When using API 1.24 and under, AutoRemove should not be
used, even if the daemon is version 1.13 or above and
"supports" this feature.

This patch fixes a situation where an 1.13 client,
talking to an 1.13 daemon, but using the 1.24 API
version, still set the AutoRemove property.

As a result, both the client _and_ the daemon
were attempting to remove the container, resulting
in an error:

    ERRO[0000] error removing container: Error response from daemon:
    removal of container ce0976ad22495c7cbe9487752ea32721a282164862db036b2f3377bd07461c3a
    is already in progress

In addition, the validation of conflicting options
is moved from `docker run` to `opts.parse()`, so
that conflicting options are also detected when
running `docker create` and `docker start` separately.

To resolve the issue, the `AutoRemove` option is now
always set to `false` both by the client and the
daemon, if API version 1.24 or under is used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-15 01:59:57 +01:00
Brian Goff 24c4226dc7 Merge pull request #29831 from vdemeester/integration-small-cleanups
[test-integration] Small cleanups on integration cli
2017-01-14 16:43:39 -05:00
Brian Goff 0fcd55072b Merge pull request #29902 from caervs/add_autorestart
Add on-failure to default restart policy
2017-01-14 16:40:02 -05:00
Brian Goff 7d24cc7710 Merge pull request #29856 from Microsoft/jjh/warntoout
Windows to Linux build warning to stdout
2017-01-14 16:37:31 -05:00
Antonio Murdaca 675f4140e7
image: tarexport: do not quote integers in format string
Basically, prevents outputs like:
```
invalid manifest, layers length mismatch: expected '\x02', got '\x01'
```

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-01-14 20:03:11 +01:00
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
Harald Albers 12952f537c Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-14 04:48:41 -08: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
Yong Tang 8dadeaf8ea Return error when insecure registry contains scheme
While investigating 29936 I noticed one potential issue
in `LoadInsecureRegistries`.

The implementation of the func assumes that the format
of insecure registry should be `host:port` if not CIDR.
However, it is very common that user may incorrectly
provide a registry with a scheme (e.g, `http://myregistry.com:5000`)
Such a registry format with a scheme will cause docker pull to
always try https endpoint.

The reason is that the func of `isSecureIndex()` actually will
check for the map of the index server for `myregistry.com:5000`
while the insecure registry only has a record of `http://myregistry.com:5000`.
As a consequence, docker assumes that `myregistry.com:5000` is not
a insecure registry and will go ahead with https endpoint.

This fix addresses the issue by error out insecure registries with scheme.

A unit test has been added.

This fix is related to 29936.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-13 19:19:30 -08:00
Tonis Tiigi 09dbce5f5a Avoid defunct registry/notary processes during tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-13 17:45:14 -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
Christopher Jones fa17ac2560
[multi-arch] get go version from arch dockerfile
Changes a couple of generate scripts so that the architecture
gets the go version from its own Dockerfile. This should cover a
rare case where the go version might have to be different from
the x86 Dockerfile.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-13 16:48:41 -05: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
Kenfe-Mickael Laventure c178700a04 Remove timeout on fifos opening
Instead of a timeout the context is cancelled on error to ensure
proper cleanup of the associated fifos' goroutines.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-13 11:46:48 -08: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