ba94f14ffd
Merge pull request #21522 from albers/docs-labels-everywhere
...
docs for labels on build, networks and volumes
Upstream-commit: 64456f3c6d1712c939d1aefe0db1510b9c4841d3
Component: engine
2016-03-25 20:04:03 +01:00
37f78983d9
Merge pull request #21516 from sdurrheimer/zsh-completion-logopt-fluentd
...
Add zsh completion for new fluentd log driver options
Upstream-commit: 7512d3ce3b074d5e6c91feb51efa36b9c4b255b4
Component: engine
2016-03-25 11:39:33 -07:00
15c81cf230
Add zsh completion for new fluentd log driver options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 396ffa2faf4b16bf6d6dbd813e967038bb2b4034
Component: engine
2016-03-25 19:28:38 +01:00
779c6aca92
docs for labels on build, networks and volumes
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 995e5beda74b99dfc920f6a79aee977ff5a15a72
Component: engine
2016-03-25 11:16:19 -07:00
2803dd9564
Merge pull request #21486 from Microsoft/jjh/execroot
...
Windows: Remove --exec-root
Upstream-commit: 786305ed0cd8f9b8b8a66b6b77907b2f8635e95b
Component: engine
2016-03-25 11:07:48 -07:00
b7378f32b5
Merge pull request #21493 from Microsoft/jjh/nativeconsole2
...
Windows: Native console disableNewlineAutoReturn
Upstream-commit: 73f8654759a2a66448d548e37b20b735b45322d9
Component: engine
2016-03-25 11:07:18 -07:00
19919a5873
Merge pull request #21503 from AkihiroSuda/fix-Dockerfile-simple
...
Update Dockerfile.simple so that it can be successfuly built
Upstream-commit: e811dab6a9ee72ac6ddc7bef5f755ae426245553
Component: engine
2016-03-25 11:06:47 -07:00
74cf4ab6a4
Merge pull request #21517 from sdurrheimer/zsh-completion-load-quiet
...
Add zsh completion for 'docker load -q --quiet'
Upstream-commit: 4bd03fe71b3f5670b89d10f32ee02af666dfe7ae
Component: engine
2016-03-25 11:06:13 -07:00
5b51de2d40
Merge pull request #21520 from albers/completion-labels-everywhere
...
bash completion for labels on build, networks and volumes
Upstream-commit: aa7be04e525554c1c71e32ac57cda1f45c91d806
Component: engine
2016-03-25 11:05:45 -07:00
071bb3598c
bash completion for labels on build, networks and volumes
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a2958aa18f148ce2672b2f0c237c288d3f200add
Component: engine
2016-03-25 10:56:04 -07:00
f7d7f8e5e6
Merge pull request #21468 from coolljt0725/remove_useless_log
...
Do not return error on hijacked connection for docker exec
Upstream-commit: e2221d1f37d1204ccca51722aa21fc11939a41ba
Component: engine
2016-03-25 10:50:43 -07:00
5b69d4f4ab
Merge pull request #21474 from jfrazelle/fastness-for-the-storage-driver-gods
...
set the default storage driver as the users current default
Upstream-commit: fc3d87f80fcf4eaf971a63b38a20227534645f3d
Component: engine
2016-03-25 10:47:40 -07:00
f97f5ba239
Merge pull request #21509 from kencochrane/add_better_unsupported_message
...
Added a better message for when we build an unsupported Docker version
Upstream-commit: 2c224fb06ad3c20ca9c32ee733904b3478c60a7b
Component: engine
2016-03-25 13:46:41 -04:00
068febd10f
Add zsh completion for 'docker load -q --quiet'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: f8009d10bba6bb179466456bf5564883d5b7deac
Component: engine
2016-03-25 18:36:45 +01:00
eebd78388f
Merge pull request #21511 from tiborvass/fix-release-scripts
...
Fix release scripts
Upstream-commit: ed95d753b45b24cb8f1b70e33ff6a4587a668477
Component: engine
2016-03-25 10:34:09 -07:00
7e5fc2836c
Merge pull request #21514 from tonistiigi/disable-privileged-test-in-userns
...
Disable privileged test in user namespace
Upstream-commit: e2628176821d3c18f33b8c1c549d33d7b12cdb9b
Component: engine
2016-03-25 10:30:12 -07:00
279536ae24
Merge pull request #21399 from LK4D4/fix_builder_race
...
builder: replace cancelled channel with net/context
Upstream-commit: 7307998a44237a8943792c279b81ff5a387a86fa
Component: engine
2016-03-25 13:09:23 -04:00
0049f49ccc
Merge pull request #21515 from albers/completion-logopt-fluentd
...
bash completion for new fluentd log driver options
Upstream-commit: f7cd8b2da01c6c99d217d883d3eb628d1118380b
Component: engine
2016-03-25 09:56:53 -07:00
6ed9290033
Disable privileged test from in user namespace
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f01e1c865f35bd6578a2c0ef5b2d530538588ecb
Component: engine
2016-03-25 09:31:36 -07:00
1ac9493cd9
Merge pull request #21477 from cpuguy83/better_logging_on_integration
...
Better logging for errors in some tests
Upstream-commit: d7b341bc06c880efbc015b6cf75e69638800ff4b
Component: engine
2016-03-25 09:16:18 -07:00
75761ed816
Fix release scripts
...
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
hack/make/generate-index-listing
We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.
This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 996138bf8e6acde9a937755ef81459f7d7566fc9
Component: engine
2016-03-25 11:55:26 -04:00
43dd16ffb4
builder: replace cancelled channel with net/context
...
Also stop execution of run immediately if request was cancelled.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f2401a0f6960734093be307a27bba85a3c2ecfcd
Component: engine
2016-03-25 08:19:29 -07:00
d3263a9591
Added a better message for when we build an unsupported version
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 181d2725d7ac8da5174b1a13d3ee413057af57b8
Component: engine
2016-03-25 10:09:03 -04:00
44532d43ae
Better logging for errors in some tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 42df9edc4a6ccfff6869fd14b2128ca3312e99db
Component: engine
2016-03-25 10:02:52 -04:00
8c2b901348
Merge pull request #21432 from vikstrous/fix_volume_store_race2
...
fix race condition between list and remove volume
Upstream-commit: e80f8364bf4a334d353c2bd7173d5214cd38988b
Component: engine
2016-03-25 09:47:49 -04:00
f279ed5a30
bash completion for new fluentd log driver options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 06e357da35801f85d440034724b5c71bcf2c45a3
Component: engine
2016-03-25 03:31:48 -07:00
d6e2929646
Merge pull request #21465 from runcom/fix-test
...
integration-cli: fix wrong test and add log
Upstream-commit: 9fbe1d9917f8c3993300b88a056f81522b9a28ab
Component: engine
2016-03-25 10:22:01 +01:00
44f1573820
Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks
...
Fix symlink copying for deb init scripts
Upstream-commit: 36458b578759839e101c8a7774ff9a0aa64abadc
Component: engine
2016-03-25 01:08:09 -07:00
ac8d6423ee
Update Dockerfile.simple so that it can be successfuly built
...
* build-essential is needed by `make`
* libapparmor-dev is needed by runc
* seccomp is needed by runc
* Go is neeeded by runc
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 4bf770a4c6940df9c538d3dac2b014fbc9ca9ac2
Component: engine
2016-03-25 16:59:07 +09:00
cfeb820c82
Merge pull request #21361 from HackToday/addfilter
...
Add name/driver filter support for volume
Upstream-commit: 2de29fb9c2eaee803d69625a7105953da941356e
Component: engine
2016-03-25 08:07:38 +01:00
38763b6eb2
Fix symlink copying for deb init scripts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 61277c395bf0f9b560e684085d0a134406a7c179
Component: engine
2016-03-24 23:15:17 -07:00
9a08ed06d7
Merge pull request #21499 from cyli/hardware-signing-experimental-again
...
Move hardware signing back to experimental again
Upstream-commit: d5019972e5d3ec800a1bef0cd2250b2ad9484100
Component: engine
2016-03-24 23:03:13 -07:00
9a2a79217f
Merge pull request #21487 from tonistiigi/fix-old-dind
...
Fix setting cgroup permission to user/privileged devices
Upstream-commit: f3d824771a10a8143ea97afb6864d0a587c7b7e3
Component: engine
2016-03-24 22:56:39 -07:00
5d223a177b
Merge pull request #21489 from calavera/downgrade_go
...
Downgrade to Go 1.5.3.
Upstream-commit: b35aaa9d1e284d17e8468ae1407e03405be4258c
Component: engine
2016-03-24 22:44:49 -07:00
d30f94de1d
Merge pull request #20589 from coolljt0725/fix_restore_terminal
...
cli: move setRawTerminal and restoreTerminal to holdHijackedConnection
Upstream-commit: 641bd7652f0f65712bab60f7a5f8e299dcb5643c
Component: engine
2016-03-24 22:42:24 -07:00
ba23c7ef71
Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
...
This reverts commit e6d3a9849c96201681915944947a0e5452619929, reversing
changes made to d3afe34b51e7588984cc21a2f48da116645e52e3.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: dd33d18045e50a198d3d75db8fba12f126e93937
Component: engine
2016-03-24 21:12:52 -07:00
4317e59a4d
Merge pull request #21484 from albers/docs-load--quiet
...
add docs for `docker load --quiet`
Upstream-commit: de4cc7cd13a8dd4d83770e0ef9405ec7d8f91864
Component: engine
2016-03-24 18:59:53 -07:00
eeff19f114
cli: move setRawTerminal and restoreTerminal to holdHijackedConnection
...
In this way, we can restore the Terminal as soon as possible once the hijacked
connection end. This not only fix weird output if cli enable -D, but also
remove duplicate code.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 66d3dcc6f7648ab5af3c7f876c2b9c63ab2899ac
Component: engine
2016-03-24 21:25:50 -04:00
553d05c397
Add name/driver filter support for volume
...
This change include filter `name` and `driver`,
and also update related docs to reflect that filters usage.
Closes : #21243
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 8e9305ef946843ce2f8ef47909d6a866eab5dfa8
Component: engine
2016-03-25 01:11:17 +00:00
6d0a18169c
Add "--ipv6" flag in IT for network create when using ipv6 subnets
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ec77c124de3f57a18d3459ed75c8a286ce14fe32
Component: engine
2016-03-24 16:19:59 -07:00
e7eeee7715
Downgrade to Go 1.5.3.
...
To not hit the issue with the request Host header.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb
Component: engine
2016-03-24 19:15:10 -04:00
3ff2e53880
Windows: Native console disableNewlineAutoReturn
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c162cdb15fb08786c85d76fb438f003e72857f5c
Component: engine
2016-03-24 15:37:47 -07:00
d3972744c1
Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version
...
Remove unnecessary hardcoded version.
Upstream-commit: 6748ecb0050f2c6a9a57e824f23b5b4afb35240d
Component: engine
2016-03-24 14:31:59 -07:00
4295dceddb
Merge pull request #21387 from kencochrane/change_packages
...
Packaging changes required for new containerd binaries
Upstream-commit: ed25df9a07f4b0ddf21fed5358eba8870fb06a9c
Component: engine
2016-03-24 17:29:55 -04:00
88d26b09ba
Fix wrong variable name on blkio resources
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8784bd6fdeb7bd87fcbbdee884d42d1dca0c4cca
Component: engine
2016-03-24 14:16:40 -07:00
5b031241b0
Fix setting cgroup permission to user/privileged devices
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ee6123588067eb067ec1c02cc340d7493c8cd9a6
Component: engine
2016-03-24 14:16:33 -07:00
ee44cd51fb
Merge pull request #21315 from hqhq/hq_check_quota
...
Add validation for cpu period and quota
Upstream-commit: f2847f8ab3467b43eccf0a9580d4ea3e8abdf146
Component: engine
2016-03-24 14:10:48 -07:00
472c0621c5
Merge pull request #21463 from yongtang/21445-too-long-hostname
...
More descriptive error when running a container with a too long hostname (#21445 )
Upstream-commit: 1e8d1b5faaa113944ed0bc6b565b90c490a5b654
Component: engine
2016-03-24 13:42:28 -07:00
1829240730
Merge pull request #21478 from albers/ignore-bashrc
...
re-add .bashrc to .gitignore
Upstream-commit: 9558d249e9586aff906391d1e5bda1b181641c98
Component: engine
2016-03-24 13:29:46 -07:00
7e9cc10806
Packaging changes required for new containerd binaries
...
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.
docker, containerd, containerd-shim, ctr, and runc
The tar files also include all 5 binaries.
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com >
Upstream-commit: bb66d7144f7d0a617f5985486ae36bbbaa5461ba
Component: engine
2016-03-24 16:25:33 -04:00
