starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-09 02:24:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
12,126 Commits 13 Branches 322 Tags
ba3cc4bafbd97249f7824324863136f65567ba1e
Commit Graph
11195 Commits
Author SHA1 Message Date
Doug Davis 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
James Turnbull 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
Sven Dowideit 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
Fred Lifton 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
Fred Lifton 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
Jessie Frazelle 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
Jessica Frazelle 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
Tianon Gravi 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
Fred Lifton 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
Jessie Frazelle 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
Michael Crosby 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
Michael Crosby 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
Tianon Gravi 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
Fred Lifton 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
Rémy Greinhofer 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
Phil Estes 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessie Frazelle 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
Alexander Morozov 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
Michael Crosby 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
Arnaud Porterie 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
Alexandr Morozov 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessie Frazelle 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
Tibor Vass 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
unclejackandTibor Vass 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
Tibor Vass 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
unclejackandTibor Vass 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
Arnaud PorterieandTibor Vass 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
Michael CrosbyandTibor Vass d25c7e6450 Decompress archive before streaming the unpack in a chroot 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	pkg/archive/archive.go
	pkg/chrootarchive/archive.go

Conflicts:
	pkg/archive/archive.go
Upstream-commit: 001ac15b54686761960352103ebf4ff2c6e1d803
Component: engine
 2014-12-11 16:29:13 -05:00
Michael CrosbyandTibor Vass a176492278 Update chroot apply layer to handle decompression outside chroot 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	pkg/archive/diff.go
	pkg/chrootarchive/archive.go

Conflicts:
	pkg/archive/diff.go
	pkg/chrootarchive/diff.go
Upstream-commit: 7862f831fe99a221a0499b7764a8709e5f463bb9
Component: engine
 2014-12-11 16:28:24 -05:00
Cristian StaretuandTibor Vass a013d9f804 Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e4ba82d50ee4642412a1e1bdf43a7b94fadd2428
Component: engine
 2014-12-11 16:26:52 -05:00
unclejackandTibor Vass 273d3a2f40 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: a57eee2229c2f0c53c32372587fcc2a8327044ea
Component: engine
 2014-12-11 16:26:52 -05:00
unclejackandTibor Vass e6c672e7d3 integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 7496cbbccc278c084620661812ed5f6390c1d2f1
Component: engine
 2014-12-11 16:26:52 -05:00
Tibor Vass dedefc8fcd Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: 0e71a48d4e89ce40c0ab94cc18599481d9e8a6b0
Component: engine
 2014-12-11 16:26:51 -05:00
Tibor Vass c828e1305e symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5f0f0c228d438f01c3b9837eb6e8e97133d9d1f5
Component: engine
 2014-12-11 16:26:01 -05:00
Tibor Vass 9e40785aa2 symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: ff4d05ed73dfff44f9bb919a0a6fccff17f866a9
Component: engine
 2014-12-11 16:26:01 -05:00
Tibor Vass 8345114eb4 Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: b7f352b0fb7159af283275437ad69142addab13b
Component: engine
 2014-12-11 16:26:01 -05:00
Tianon GraviandTibor Vass 203304857b Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: fa3ec89515431ce425f924c8a9a804d5cb18382f
Component: engine
 2014-12-11 16:26:01 -05:00
Aleksa Sarai c0c6361cf0 builder: internals: fix incomplete chown walk when fixing permissions 
This patch fixes the permission fixing code used by addContext, which
would not be responsible for Lchown-ing top-level directories added to a
destination that didn't exist prior to untar-ing the context.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 916cba9c587a3f3ce97b407993fecd96ac2fecaf
Component: engine
 2014-12-12 06:07:16 +11:00
Vincent Batts 62c0414eca Merge pull request #9258 from rhvgoyal/transaction-id-improvements 
devmapper fix usage of pool transaction id 
Upstream-commit: 74bbb935715a3f384a4a3a527053af5419f5a72e
Component: engine
 2014-12-11 12:58:18 -05:00
unclejack a4df086351 Bump version to v1.3.3 
Upstream-commit: d3446258471733fe667f0abdf015ee3ebd2f3485
Component: engine
 2014-12-11 17:37:17 +02:00
Hans Rødtangandunclejack 8273ff6e18 Updated cover tool import path. 
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
Upstream-commit: 496c2748cfef82fea3f5e1be5fbf845b478420aa
Component: engine
 2014-12-11 17:37:17 +02:00
Alexandr Morozov 41b0254a74 Fix race in TestDaemonRestartWithVolumesRefs 
Sometimes rm begins before process death, but Kill called already after
it, so we get error - no such process.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 0d70ad1c7205ba9e82dd1f244d26df93dc79de9e
Component: engine
 2014-12-10 20:55:51 -08:00
Michael Crosby 807e0b468d Refactor put image function's redirect loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9a7a1e5be01b829e64b32a8b0f1d260f0a2a45c3
Component: engine
 2014-12-10 18:11:27 -08:00
Michael Crosby e42acc43c3 Prevent loop with var overshadowing 
Incase of a 3xx redirect the var was being overshowed and ever changed
causing an infinite loop.

Fixes #9480

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3b4de1070fac41c400c22f200438c90823e7769d
Component: engine
 2014-12-10 17:43:21 -08:00