7829f8b05d
Move resize after attaching
...
Resize by +1 when attaching to force redrawing.
Start monitoring window size after the attach begins instead of before. This way, you see the output
from the container without having to manually resize or hit enter. This makes attach consistent with
run and exec.
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: 7a948f6a969137c2f8f0b47e75b30cc28ac0a37c
Component: engine
2016-01-24 02:24:00 -05:00
426fb03f9a
Merge pull request #19793 from calavera/full_login_prompt
...
Always prompt for a password when asking for credentials.
Upstream-commit: 6c6729ef5b74a54e20eb2a11812bf5f80e03b174
Component: engine
2016-01-29 12:39:57 +01:00
e306c92f3c
Merge pull request #19790 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: 5f63c541920ff1ef9d82220f4a18cd7531f3973a
Component: engine
2016-01-29 08:52:08 +01:00
29c84a9273
Merge pull request #19563 from Microsoft/10662-TestBuildCI1
...
First batch of Windows-Windows TestBuild CI enabling
Upstream-commit: 7d13f2fb7d50e2cf93022a692fe93a59ee65e866
Component: engine
2016-01-28 17:13:45 -08:00
0cbea6f330
Merge pull request #19795 from jfrazelle/release-checklist
...
some cleanup to release checklist
Upstream-commit: 4da9cd5df64dced9df07432e8047ca4c901f7238
Component: engine
2016-01-28 16:43:57 -08:00
1a1c305766
Merge pull request #19811 from albers/completion-user
...
Improve bash completion for users and groups
Upstream-commit: 17be787dca98ba256ea4ea00a16dd8e5afcf5b3c
Component: engine
2016-01-28 16:39:26 -08:00
913281f6d2
Temporarily removing TestBuildHistory on Windows for perf reasons
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 87839b345ea481702849ccada6fe429c378df85a
Component: engine
2016-01-28 13:42:02 -08:00
025414686c
Fix typos in create.go
...
There were a few spelling issues that I noticed when reading about shared mounts.
Signed-off-by: jgeiger <joey.geiger@irco.com >
Upstream-commit: 318b4f0b5f0639149f5e88aba805cdd454d4d9ee
Component: engine
2016-01-28 14:08:11 -07:00
2735bcc7e9
Merge pull request #19766 from anujbahuguna/master
...
Adding biologist Christiane Nüsslein Volhard and AI pioneer Marvin Mi…
Upstream-commit: 630a5a23c73276faefaedd0b639ce1525c2bdc24
Component: engine
2016-01-28 11:06:24 -08:00
07e52f456b
Merge pull request #19733 from calavera/auth_error_on_post_create
...
Respond with 401 when there is an unauthorized error from the registry.
Upstream-commit: 0b7acaf4b949ceab3b13d4f91bf7072a1bd76484
Component: engine
2016-01-28 13:44:58 -05:00
f5e575363e
Improve bash completion for users and groups
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e5ea96fa6241bdd10e174cf553d57daaf96c234
Component: engine
2016-01-28 09:48:47 -08:00
af019e7c8c
Adding biologist Christiane Nüsslein Volhard and AI pioneer Marvin Minsky
...
Signed-off-by: Anuj Bahuguna anujbahuguna.dev@gmail.com
Signed-off-by: Anuj Bahuguna <anujbahuguna.dev@gmail.com >
Upstream-commit: 2d459a160020f2a8a3482d8c5649996120123633
Component: engine
2016-01-28 14:33:58 +00:00
d551cc0b90
bash completion for journald tag support
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 11fe3edacbbba2633bc044ec044377febbd7d759
Component: engine
2016-01-28 08:41:37 +01:00
87883a2e64
Merge pull request #19769 from HackToday/fixubuntudoc
...
Make install instruction consistent
Upstream-commit: 7ee1aaf06d311856f0e8b4b4c21249458e01fc77
Component: engine
2016-01-28 08:31:45 +01:00
45d01482b0
Merge pull request #19401 from wenchma/18410-default_net_driver
...
docs: document options for default network driver
Upstream-commit: adb9fa736283bd0c57edccd44819207c63f8be98
Component: engine
2016-01-28 08:30:30 +01:00
fb0f0495d5
Merge pull request #19773 from coolljt0725/fix_message
...
Correct the info message when stop container
Upstream-commit: 36b5e6317906d949bf5f823a357f4e30d78e6f98
Component: engine
2016-01-28 08:29:42 +01:00
eff09fc3a5
Make install instruction consistent
...
Right now in ubuntu section, instruction is not consistent
for sudo, so it is better to keep it style same.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: b02552124b5241d4f29d4d69de26e84110cc562c
Component: engine
2016-01-28 06:54:59 +00:00
9cc23f26d7
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
88afeb1908
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ec31741ca186278ea60faf49f85087c493e78806
Component: engine
2016-01-27 16:17:35 -08:00
8fb9ea9806
some cleanup
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 404d20861c49d6e8ca3095bc54e2d5c78599832c
Component: engine
2016-01-27 15:39:01 -08:00
eb91553b41
Merge pull request #17849 from daehyeok/remove_empty_file
...
Remove output file when save/export fail
Upstream-commit: 3dd01713d8d3a84ab603fa865d32bd23ba6684b6
Component: engine
2016-01-27 15:31:29 -08:00
98aeb8772a
Always prompt for a password when asking for credentials.
...
There is a weird behavior where we don't ask for a password
when the user you type in the prompt is the same you have configured
in the config file.
This is the source of many frustrations and also a bug.
If the authentication with a registry fails because the password
is incorrect, we won't ask for the password again with the current logic.
With this change, we also stop calling `CmdLogin` directly when
authentication fails. We don't need to parse flags from the cli or
setting up input destriptiors again, like the current behavior is doing.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 8ed06af0443f4239f446b3cff202d91a61af350f
Component: engine
2016-01-27 18:26:48 -05:00
5ca7c24367
Merge pull request #19747 from cpuguy83/nogc
...
Turn off GC during `make binary`
Upstream-commit: 07312af8fa160c1c87558288e1de9d309b1e9c90
Component: engine
2016-01-27 15:02:38 -08:00
bcbfddb2b6
Merge pull request #19788 from cyli/vendor-notary
...
Include a new version of notary with less verbose INFO+ logging
Upstream-commit: e5b1f29ac311d98b9f92b0211be2477d040e49e0
Component: engine
2016-01-27 14:35:32 -08:00
154bed9787
Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
...
Added flag to ignore fluentd connect error on container start
Upstream-commit: 7a016578dbb5c9b8a43b43e1ce96785fa26baf56
Component: engine
2016-01-27 14:25:24 -08:00
c193203fff
Merge pull request #19741 from jfrazelle/better-apparmor-docs
...
way better apparmor docs
Upstream-commit: c1191eb0e83629a6623ee6119ddb7097538f3fc3
Component: engine
2016-01-27 14:22:54 -08:00
dcac710fd9
way better apparmor docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: a6701790ee585c625c6a39413d2772dc7ecf80fd
Component: engine
2016-01-27 14:08:42 -08:00
430a04619f
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
Upstream-commit: 0f5aa19593dd2258a26adf37e41e00cbbbab8cf1
Component: engine
2016-01-27 13:42:56 -08:00
24f696e76e
Merge pull request #19721 from bboreham/doc-ip-failure
...
Improve wording about re-assigning IP addresses
Upstream-commit: 7beccdc609667e6ec7517494779bbb2ef61102af
Component: engine
2016-01-27 22:17:06 +01:00
7a7dba5630
Merge pull request #19775 from coolljt0725/fix_prepare_mount
...
daemon: don't prepare mountpoint for restart container
Upstream-commit: f4e5eb3f86a6d8681bbf85d5f46d589c242a3578
Component: engine
2016-01-27 16:11:12 -05:00
53da62423e
FAQ: add docker daemon unavailable note
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 83c1fd6f53d1b061fd71057210a6e317fcd56359
Component: engine
2016-01-27 21:18:02 +01:00
860892d919
Respond with 401 when there is an unauthorized error from the registry.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7bca93218291767c5dd8782de0ad630dbcda9995
Component: engine
2016-01-27 13:55:33 -05:00
259365d60a
Add DOCKER_BUILD_GOGC to tweak GOGC for compile
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
2016-01-27 13:35:26 -05:00
d8e7280e1e
Merge pull request #19564 from bobrik/journald-tag
...
Add tag support to journald logging driver, closes #19556
Upstream-commit: fff1511c56e35cf5230d05af2282d31d23a31dc0
Component: engine
2016-01-27 19:21:23 +01:00
ee8542db2e
Include a new version of notary with less verbose INFO+ logging
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
2016-01-27 09:46:26 -08:00
0da34ddb69
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
2016-01-27 09:36:26 -08:00
0f96a7bb9f
Merge pull request #19784 from vdemeester/oh-tools-it
...
Fix TOOLS.md jenkins plugin link :)
Upstream-commit: 6b2c1ed4c0921834311244d2c23e91f670c22084
Component: engine
2016-01-27 09:34:29 -08:00
5cfcf48d8a
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: caad94d7bb12f07976141b4e7bc04f94f0380961
Component: engine
2016-01-27 17:11:12 +00:00
7f9cdda847
Factorize sleeping containers
...
Add `runSleepingContainer` and `runSleepingContainerInImage` helper
functions to factor out the way to run system-specific idle containers.
Define a sleeping container as command `top` in image `busybox` for
Unix and as command `sleep 60` in image `busybox` for Windows. Provide a
single point of code to update those.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 777ee34b075292e5aee16c4088444508899f8f35
Component: engine
2016-01-27 08:48:08 -08:00
7383a82de4
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
Upstream-commit: ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44
Component: engine
2016-01-27 11:21:01 -05:00
e30b51b22f
Fix TOOLS.md jenkins plugin link :)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 85449137548f98e2af9b06818183b2b60d51d9f0
Component: engine
2016-01-27 16:33:20 +01:00
efdc7448da
Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock
...
fix dead lock in volume store dereference
Upstream-commit: c17d4b4ebb7f15b4fcb32d191ea3306d13f15d06
Component: engine
2016-01-27 09:28:11 -05:00
7835159bd3
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
Upstream-commit: c1b168664f3b0d92164f1a4308ad6c653d38cf40
Component: engine
2016-01-27 14:08:28 +01:00
8977875ac5
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com >
Upstream-commit: 5a3351883b254d3690e9dcc5b89293bcee474493
Component: engine
2016-01-27 10:52:19 +00:00
debd24d25b
fix dead lock in volume store dereference
...
Signed-off-by: Pei Su <sillyousu@gmail.com >
Upstream-commit: f5310652d30e72fe88a3edc70b2911397c28b7e4
Component: engine
2016-01-27 16:34:10 +08:00
42e15b6834
Improve bash completion for docker volume ls -f dangling
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a381efcf39ef7f82b1496a4bbaf42df096d91bc5
Component: engine
2016-01-27 09:32:14 +01:00
46738c170b
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
Upstream-commit: 805a107df4c43e5fd20dce7d716001290d7b2840
Component: engine
2016-01-27 09:07:47 +01:00
2336bc4aed
Correct the info message when stop container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 6716a3a167fcd0a9abc013ce536117175922af96
Component: engine
2016-01-27 03:06:45 -05:00
d35ce892f0
Merge pull request #19759 from thaJeztah/docs-for-19688
...
Fix docs for tmpfs (pr 19688)
Upstream-commit: ab8da94531ba77feee1931923be812354fbd2b2c
Component: engine
2016-01-27 00:05:38 -08:00
3bba97b9dd
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
2016-01-26 23:52:14 -08:00
Andy Goldstein
Vincent Demeester
Sebastiaan van Stijn
Tibor Vass
Darren Stahl
Joey Geiger
David Calavera
Brian Goff
Harald Albers
Anuj Bahuguna
Kai Qiang Wu(Kennan)
Wen Cheng Ma
Jessica Frazelle
Jess Frazelle
Tomasz Kopczynski
cyli
Bryan Boreham
Arnaud Porterie
Antonio Murdaca
Ivan Babrou
Pei Su
Lei Jitang
Sebastiaan van Stijn