fdaf63a14a
Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
...
Fix #9462
Upstream-commit: f58a79e59191dd196a48c65ed945e96b944b8567
Component: engine
2014-12-15 08:13:11 -08:00
dd3d46bab0
Add available filters for containers, images and events to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
Upstream-commit: 51da97628a0ffb2a1c4be2c4d1bbcb09537d6c8d
Component: engine
2014-12-15 16:51:29 +01:00
159fd556c5
Add container list filtering to API docs.
...
Signed-off-by: Kamil Domański <kamil@domanski.co > (github: kdomanski)
Upstream-commit: 37bdb05615763f94f7877cce3426752d43b48ff7
Component: engine
2014-12-15 16:50:56 +01:00
653e69570e
Merge pull request #9660 from LK4D4/remove_bad_test
...
Remove TestRunErrorBindNonExistingSource
Upstream-commit: 7da0f2ee1991786f0a62a989ea2276c37d409b2c
Component: engine
2014-12-15 17:20:17 +02:00
ba3cc4bafb
Wrap strings that could look like ints in quotes
...
When we use the engine/env object we can run into a situation where
a string is passed in as the value but later on when we json serialize
the name/value pairs, because the string is made up of just numbers
it appears as an integer and not a string - meaning no quotes. This
can cause parsing issues for clients.
I tried to find all spots where we call env.Set() and the type of the
name being set might end up having a value that could look like an int
(like author). In those cases I switched it to use env.SetJson() instead
because that will wrap it in quotes.
One interesting thing to note about the testcase that I modified is that
the escaped quotes should have been there all along and we were incorrectly
letting it thru. If you look at the metadata stored for that resource you
can see the quotes were escaped and we lost them during the serialization
steps because of the env.Set() stuff. The use of env is probably not the
best way to do all of this.
Closes : #9602
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d942c59b696d16def85f6b65ae65c176f66a5562
Component: engine
2014-12-15 05:10:49 -08:00
9158ffcf49
Merge pull request #9633 from estesp/docs-ubuntu-install
...
DOCS: Update Ubuntu install instructions regarding dated Ubuntu docker.io
Upstream-commit: 24a81829284c9c9966f3dbc239dff9adca09d5ef
Component: engine
2014-12-15 04:52:27 -05:00
6983cd24af
Fix incorrect error type.
...
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com >
Upstream-commit: bc4edbbe712a2d0fb839747814933916177daa74
Component: engine
2014-12-15 17:29:28 +08:00
55530bfc16
Merge pull request #9556 from nealmcb/9555-https-no-sudo
...
Fixes #9555 : sudo not needed with cert authn
Upstream-commit: e4b2f802ae669f4a89b04576ac92c95858773810
Component: engine
2014-12-15 15:08:03 +11:00
9715e33218
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 >
Upstream-commit: 4d7359f63db200298f9d07f6434a7a4b16c25c88
Component: engine
2014-12-14 18:09:41 -08:00
e377141ba0
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 >
Upstream-commit: 70a2b64ef2e31aef84c39b979686e9194aee22a6
Component: engine
2014-12-13 21:45:02 -08:00
07bed8ab38
Clarify Mac OS X experience.
...
Signed-off-by: Mary Anthony <moxieandmore@gmail.com >
Upstream-commit: 228404860ca12ea5fb09098bc2a1a16cc96c7e10
Component: engine
2014-12-13 20:17:17 -08:00
2bba0486d0
Merge pull request #9647 from fredlf/release-notes-edits
...
Fixed errors in release notes
Upstream-commit: 86c2cdf78242f09dc5ae22ec4cb2c37cdb69db2f
Component: engine
2014-12-13 17:34:23 -08:00
15b350dcf5
Set HTTP upgrade headers when hijacking connection
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: 9256578f62ffe885befa3ef2dbdd9ec0bea1d7e8
Component: engine
2014-12-13 14:24:51 +01:00
8f45a1fd40
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)
Upstream-commit: afc262cc3ab68129104e3d799f8a2694f61aa68f
Component: engine
2014-12-12 17:18:21 -08:00
d41b765b19
Merge pull request #9639 from jfrazelle/advertise-master-builds
...
Add master builds url to readme.
Upstream-commit: 8ca28a35c75b85404f2d2fc1ca2c35221ac33fc0
Component: engine
2014-12-12 16:44:52 -08:00
fe9c064de8
Add master builds url to readme.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 1b104ce7c3b18ad4bd38a819525a0d5ad78d3c85
Component: engine
2014-12-12 16:26:44 -08:00
db3cf4f54c
Add windows back.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 54229fad933c91f5d890e14be389651e98f62e02
Component: engine
2014-12-12 13:44:41 -08:00
725ed0d2e6
Merge pull request #9551 from barnybug/9550-fish-completions
...
Update fish shell completions.
Upstream-commit: d727e3bea6cb0b833f415f6ba2207ee2f82c1453
Component: engine
2014-12-12 12:55:00 -08:00
cb267b8310
Merge pull request #9636 from fredlf/add-user-invites
...
Adds User Invites to Hub Docs
Upstream-commit: 506a8c24d7b08f99f53b064f3d83308af127e2e4
Component: engine
2014-12-12 11:37:05 -08:00
98f1f432b6
Merge pull request #9625 from LK4D4/fix_race_in_sec_opts
...
Fix race condition between parseSecurityOpt and container.Mount
Upstream-commit: b66abaa291ae9de714d15371b3f7e7dcd58853ce
Component: engine
2014-12-12 11:34:59 -08:00
c10a2aa68d
Merge pull request #9637 from tianon/minor-nuke-fixes
...
Fix a bashism and some minor bugs in nuke-graph-directory.sh
Upstream-commit: 4099f098bd46ce6b65e582919f75952e2ed65aa1
Component: engine
2014-12-12 11:31:17 -08:00
00d7210a86
Using container-vm image alias instead of specific name with version.
...
Signed-off-by: Dawn Chen <dawnchen@google.com >
Upstream-commit: 0b3caf1f78c167239d7879d3bfd0d0d95a48a3d7
Component: engine
2014-12-12 11:28:54 -08:00
b3e03a9b7c
Merge pull request #9626 from jfrazelle/update-release
...
Updates to release checklist.
Upstream-commit: e76168c0032048170655efab7d5e067f50a33a34
Component: engine
2014-12-12 11:18:12 -08:00
50ca4df488
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 >
Upstream-commit: 4856ec075422a7926b62762749a7fbcc869efa99
Component: engine
2014-12-12 11:15:31 -08:00
149e33e015
Fix vet errors about json tags for unexported fields
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c7ff6bf69149bc5892633d95ebfacaf3ad36a008
Component: engine
2014-12-12 11:01:46 -08:00
bebcb13002
Fix vet errors about formatting directives
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a7ae7fed7311551975d2bccb7417c328be3ea478
Component: engine
2014-12-12 10:58:56 -08:00
67fd26525f
Fix a bashism and some minor bugs in nuke-graph-directory.sh
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 6b340e391cff68e6fc2c816cf15ffd67feddf029
Component: engine
2014-12-12 11:51:12 -07:00
e0b22078ad
Fix vet errors in aufs.go about Lock by value
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2540765ddc8889e2757f9ccfbfe852074b61601c
Component: engine
2014-12-12 10:46:09 -08:00
7886e44221
Fix vet errors about unkeyed fields
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e7d086c2be41dfedfa5f2fb0c437eb5bbf6f2f5d
Component: engine
2014-12-12 10:44:59 -08:00
092ddf63ff
Adds User Invites to Hub Docs
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: bf05f78d700532bb7504a2e1fd388f81c48aa2e6
Component: engine
2014-12-12 10:34:15 -08:00
1f4328ca63
Report number of times that docker has auto-restarted a container
...
Fixes #9469 .
Signed-off-by: Rémy Greinhofer <remy.greinhofer@livelovely.com >
Upstream-commit: 8f8d24cb1c762e74833bbb9b6e2b58438b42d36b
Component: engine
2014-12-12 09:40:11 -08:00
85ddb11009
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)
Upstream-commit: bb25f54a9953ce4d87cddad880befb016aa276d7
Component: engine
2014-12-12 11:57:23 -05:00
e5b08a1313
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)
Upstream-commit: a65396b079c1b05255553af8cde3a94d7796e752
Component: engine
2014-12-11 19:00:34 -08:00
3e6d4351a9
Updates to release checklist.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 473a443d84084e0393be2a1606d3fa49a26f4dbd
Component: engine
2014-12-11 18:47:47 -08:00
98f4a5ba65
Merge pull request #9606 from LK4D4/fix_race_in_test
...
Fix race in TestDaemonRestartWithVolumesRefs
Upstream-commit: c60e60a184cd8b07ea29f073585cb214408cdd7e
Component: engine
2014-12-11 18:27:38 -08:00
88fcffd088
Merge pull request #9624 from icecrime/silence_loginwithouttty_test
...
Suppress output of TestLoginWithoutTTY
Upstream-commit: a07835d876b8c8f1991868cc6f1c9b3e2726eaec
Component: engine
2014-12-11 18:26:58 -08:00
f42b6ea0bd
Fix #9462
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: d04debddd983b3aa48ad38659d2c3debe794d374
Component: engine
2014-12-12 03:25:14 +01:00
1018b62fc8
Merge pull request #9599 from LK4D4/no_release_non_own
...
Don't try release network in non-private modes
Upstream-commit: 14a82de6fa1c3a2fa2e2f136b07be66b47445cdb
Component: engine
2014-12-11 18:25:00 -08:00
6a7248c5b7
Suppress output of TestLoginWithoutTTY
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1cab340c10be71382a8cfde8402f475d503c94be
Component: engine
2014-12-11 18:05:07 -08:00
d98b25173b
Fix race condition between parseSecurityOpt and container.Mount
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 862952c8d4d3df69f35535af5ce5a079b5fe739e
Component: engine
2014-12-11 17:22:59 -08:00
02f274f524
Fix conflicts.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: fd831b4c5e50a3f1de8eb506016ffe89d5cac8d4
Component: engine
2014-12-11 17:14:53 -08:00
598ae24e5e
Change version to 1.4.0-dev
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c509835475f4f222400e6a4d2211c59e41329817
Component: engine
2014-12-11 17:00:43 -08:00
1ad288d656
Bump version to v1.4.0
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4595d4fb03093acf87b905bebc5ba4964d7c0707
Component: engine
2014-12-11 15:00:44 -08:00
24fce77535
Merge branch master into bump_v1.4.0
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: debf60b4665dc2bc7f11cad5a996a5fa05fe2112
Component: engine
2014-12-11 15:00:03 -08:00
d60ea06db7
Merge pull request #9616 from cyphar/9608-builder-fix-incomplete-chown-walk-addcontext
...
builder: internals: fix incomplete chown walk when fixing permissions
Upstream-commit: ce1393cb553fba082e2a3cf349c7325f4ae6bc7e
Component: engine
2014-12-11 13:54:08 -08:00
a9aac14d67
Change version to 1.3.3-dev
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 9f48be69e5c315f4e08390e796fbceaed3ed92e0
Component: engine
2014-12-11 16:35:22 -05:00
e7b124613e
Bump version to v1.3.3
...
Conflicts:
VERSION
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 5b851982da2b4fc4c42a7ad0279c65f8d1de08de
Component: engine
2014-12-11 16:33:20 -05:00
b544394ad7
docs: Add release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: fdabd6b14e394721aaf61402bb88073e7eb424bf
Component: engine
2014-12-11 16:29:28 -05:00
24d7379326
validate image ID properly & before load
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Conflicts:
graph/load.go
Upstream-commit: bff1d9dbce76bed1e267a067eb4a1a74ef4da312
Component: engine
2014-12-11 16:29:27 -05:00
67b329feba
Add integration test for xz path issue
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Conflicts:
integration-cli/docker_cli_build_test.go
Upstream-commit: af2021955cb01507984cbd076edaf3caaf5b89b3
Component: engine
2014-12-11 16:29:15 -05:00
