Arnaud Porterie
a76f7c6ec3
Merge pull request #9122 from dqminh/debug-huge-expose
...
Expose a large number of ports should not slow down builder
2014-12-16 10:03:31 -08:00
James Turnbull
92d24e3b7c
Merge pull request #9651 from kdomanski/filter_docs
...
Document container list filtering in API docs
2014-12-16 01:38:49 -05:00
Michael Crosby
24d03b8dde
Merge pull request #9631 from cpuguy83/9628_fix_volumes_hostconfig_on_start
...
Fix volumes-from/bind-mounts passed in on start
2014-12-15 15:51:57 -08:00
Michael Crosby
b84bfb43cd
Merge pull request #9638 from crosbymichael/build-volumes-retain-contents
...
Add test to enforce volume build content
2014-12-15 14:54:38 -08:00
Brian Goff
d44c9f9147
Fix volumes-from/bind-mounts passed in on start
...
Fixes #9628
Slightly reverts #8683 , HostConfig on start is _not_ deprecated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-12-15 16:51:15 -05:00
Jessie Frazelle
03142fd5d2
Merge pull request #9674 from LK4D4/log_done
...
Fix missing logDone for TestRunMutableNetworkFiles
2014-12-15 13:48:04 -08:00
Alexander Morozov
03bdacbb4e
Fix missing logDone for TestRunMutableNetworkFiles
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-15 13:44:22 -08:00
Jessie Frazelle
e6a68a1c87
Merge pull request #9613 from pwaller/push-err-confusion-fix
...
Improve message when pushing a non-existent image
2014-12-15 09:54:34 -08:00
Alexander Morozov
1bdf579928
Merge pull request #9642 from jfrazelle/windows
...
Add windows back.
2014-12-15 08:36:36 -08:00
Tibor Vass
5e888abf7a
Merge pull request #9666 from LK4D4/cleanup_tests
...
Remove TestRunExitOnStdinClose
2014-12-15 11:24:40 -05:00
Alexander Morozov
c533d2cb9b
Merge pull request #9668 from viirya/fix_error_type
...
Fix incorrect error type
2014-12-15 08:18:34 -08:00
Jessie Frazelle
f58a79e591
Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
...
Fix #9462
2014-12-15 08:13:11 -08:00
Kamil Domanski
51da97628a
Add available filters for containers, images and events to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
2014-12-15 16:51:29 +01:00
Kamil Domanski
37bdb05615
Add container list filtering to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
2014-12-15 16:50:56 +01:00
unclejack
7da0f2ee19
Merge pull request #9660 from LK4D4/remove_bad_test
...
Remove TestRunErrorBindNonExistingSource
2014-12-15 17:20:17 +02:00
James Turnbull
24a8182928
Merge pull request #9633 from estesp/docs-ubuntu-install
...
DOCS: Update Ubuntu install instructions regarding dated Ubuntu docker.io
2014-12-15 04:52:27 -05:00
Liang-Chi Hsieh
bc4edbbe71
Fix incorrect error type.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
2014-12-15 17:29:28 +08:00
Sven Dowideit
e4b2f802ae
Merge pull request #9556 from nealmcb/9555-https-no-sudo
...
Fixes #9555 : sudo not needed with cert authn
2014-12-15 15:08:03 +11:00
Alexandr Morozov
4d7359f63d
Remove TestRunExitOnStdinClose
...
Because this is already tested by TestRunExitOnStdinClose in
integration-cli/docker_cli_run_test.go
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-14 18:09:41 -08:00
Alexandr Morozov
70a2b64ef2
Remove TestRunErrorBindNonExistingSource
...
This test tests nothing because of error in cmd, where "echo 'should
fail'" passed as binary. Also this test directly contradicts
documentation and current daemon behavior.
Fixes #7826
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-13 21:45:02 -08:00
Fred Lifton
86c2cdf782
Merge pull request #9647 from fredlf/release-notes-edits
...
Fixed errors in release notes
2014-12-13 17:34:23 -08:00
Fred Lifton
afc262cc3a
Fixed errors in release notes
...
Fixed a missing link and a few small formatting issues. Also deleted 1.3 notes as originally intended.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-12-12 17:18:21 -08:00
Jessie Frazelle
8ca28a35c7
Merge pull request #9639 from jfrazelle/advertise-master-builds
...
Add master builds url to readme.
2014-12-12 16:44:52 -08:00
Jessica Frazelle
1b104ce7c3
Add master builds url to readme.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-12 16:26:44 -08:00
Jessica Frazelle
54229fad93
Add windows back.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-12 13:44:41 -08:00
Tianon Gravi
d727e3bea6
Merge pull request #9551 from barnybug/9550-fish-completions
...
Update fish shell completions.
2014-12-12 12:55:00 -08:00
Fred Lifton
506a8c24d7
Merge pull request #9636 from fredlf/add-user-invites
...
Adds User Invites to Hub Docs
2014-12-12 11:37:05 -08:00
Jessie Frazelle
b66abaa291
Merge pull request #9625 from LK4D4/fix_race_in_sec_opts
...
Fix race condition between parseSecurityOpt and container.Mount
2014-12-12 11:34:59 -08:00
Michael Crosby
4099f098bd
Merge pull request #9637 from tianon/minor-nuke-fixes
...
Fix a bashism and some minor bugs in nuke-graph-directory.sh
2014-12-12 11:31:17 -08:00
Michael Crosby
e76168c003
Merge pull request #9626 from jfrazelle/update-release
...
Updates to release checklist.
2014-12-12 11:18:12 -08:00
Michael Crosby
4856ec0754
Add test to enforce volume build content
...
This tests ensures that the content from a dir within a build is carried
over even if VOLUME for that dir is specified in the Dockerfile. This
test ensures this long standing functionality.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-12-12 11:15:31 -08:00
Tianon Gravi
6b340e391c
Fix a bashism and some minor bugs in nuke-graph-directory.sh
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-12-12 11:51:12 -07:00
Fred Lifton
bf05f78d70
Adds User Invites to Hub Docs
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-12-12 10:34:15 -08:00
Alexander Morozov
d7d981bf3a
Merge pull request #9621 from rgreinho/issue/9469
...
Report number of times that docker has auto-restarted a container
2014-12-12 10:13:37 -08:00
Rémy Greinhofer
8f8d24cb1c
Report number of times that docker has auto-restarted a container
...
Fixes #9469 .
Signed-off-by: Rémy Greinhofer <remy.greinhofer@livelovely.com>
2014-12-12 09:40:11 -08:00
Tibor Vass
a9ecd2116b
Merge pull request #9627 from jfrazelle/release-notes
...
Include Fred's release notes for 1.4.0.
2014-12-12 12:29:09 -05:00
Phil Estes
bb25f54a99
Update Ubuntu install instructions regarding dated Ubuntu docker.io
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-12-12 11:57:23 -05:00
Jessica Frazelle
a65396b079
Include fred's release notes for 1.4.0.
...
He is unfortunately out of power and internet because of storms :(
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 19:00:34 -08:00
Jessica Frazelle
473a443d84
Updates to release checklist.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 18:47:47 -08:00
Jessie Frazelle
c60e60a184
Merge pull request #9606 from LK4D4/fix_race_in_test
...
Fix race in TestDaemonRestartWithVolumesRefs
2014-12-11 18:27:38 -08:00
Alexander Morozov
a07835d876
Merge pull request #9624 from icecrime/silence_loginwithouttty_test
...
Suppress output of TestLoginWithoutTTY
2014-12-11 18:26:58 -08:00
Zoltan Tombol
d04debddd9
Fix #9462
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2014-12-12 03:25:14 +01:00
Michael Crosby
14a82de6fa
Merge pull request #9599 from LK4D4/no_release_non_own
...
Don't try release network in non-private modes
2014-12-11 18:25:00 -08:00
Tibor Vass
5a26b89751
Merge pull request #9623 from jfrazelle/merge_release_v1.4.0
...
Merge release v1.4.0
2014-12-11 21:24:28 -05:00
Arnaud Porterie
1cab340c10
Suppress output of TestLoginWithoutTTY
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-11 18:05:07 -08:00
Alexandr Morozov
862952c8d4
Fix race condition between parseSecurityOpt and container.Mount
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-11 17:22:59 -08:00
Jessica Frazelle
fd831b4c5e
Fix conflicts.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 17:14:53 -08:00
Jessica Frazelle
c509835475
Change version to 1.4.0-dev
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 17:00:43 -08:00
Jessie Frazelle
0e4e200071
Merge pull request #9345 from jfrazelle/bump_v1.4.0
...
Bump version to 1.4.0
2014-12-11 16:31:29 -08:00
Jessica Frazelle
4595d4fb03
Bump version to v1.4.0
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-11 15:00:44 -08:00