toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,757 Commits 3 Branches 295 Tags
bc5bfe8ae5f7074bf2483afe43ccb7f635858781
Commit Graph
11757 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass bc5bfe8ae5 archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 31d1d733037b22591e2dd2edfe6c4d2d4b8086cc
Component: engine
 2014-11-25 01:03:41 +02:00
Tibor Vass 89c9d8d1a2 archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1852cc38415c3d63d18c2938af9c112fbc4dfc10
Component: engine
 2014-11-25 01:03:41 +02:00
Tibor Vass 588421ad7a archive: add breakout tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	pkg/archive/archive.go
		fixed conflict which git couldn't fix with the added BreakoutError

Conflicts:
	pkg/archive/archive_test.go
		fixed conflict in imports
Upstream-commit: 221617dbcd9431f14a3779d8bac9aba52f78ea21
Component: engine
 2014-11-25 01:03:41 +02:00
unclejack 8fc694c819 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/graphdriver/aufs/aufs_test.go
		fixed conflict caused by imports
Upstream-commit: 209deff9633b82198925846ebcb0a02191553005
Component: engine
 2014-11-25 01:03:40 +02:00
Tibor Vass 9d0c84c559 pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	graph/load.go
		fixed conflict in imports
Upstream-commit: 9c01bc249dc628280f3fc019d5f0e0ace71be248
Component: engine
 2014-11-25 01:03:40 +02:00
unclejack dd4a9e5429 add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	builder/internals.go
	daemon/graphdriver/aufs/aufs.go
	daemon/volumes.go
		fixed conflicts in imports
Upstream-commit: 1cb17f03d0b217acf2d2c289b4946d367f9d3e80
Component: engine
 2014-11-25 01:03:40 +02:00
Michael Crosby 3527869dfc Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: fa1484d12c5b66f7db03a9c93002ba3df56cdb4e
Component: engine
 2014-11-25 01:03:40 +02:00
Michael Crosby 8c7a6654fa Move security opts to HostConfig 
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.

We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct.  Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	daemon/create.go
		changing config to hostConfig was required to fix the
		 build
Upstream-commit: 294843ef23fcff3c080d9fbd12df17ae7006a9f8
Component: engine
 2014-11-25 01:02:30 +02:00
unclejack efd16d2764 pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: faab87cc36fb6f02ddd53e1be09f10623a40773a
Component: engine
 2014-11-25 00:27:05 +02:00
Jessie Frazelle d700b94cc1 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
Upstream-commit: 39284be960d3d528ecf3faaa7900f4718e959c06
Component: engine
 2014-11-24 13:35:45 -08:00
Tianon Gravi 1705df26bc Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2 
zsh: correctly parse available subcommands (completion)
Upstream-commit: 748fe7a0fa8df73d89df729ce307c24ac881ae1e
Component: engine
 2014-11-24 13:36:58 -07:00
Michael Crosby 4704f56d5d Merge pull request #9301 from krivenok/master 
Fixed typo in documentation.
Upstream-commit: b4757445ae5dd4de63d793d2c54232d5254b7a9c
Component: engine
 2014-11-24 12:27:56 -08:00
Michael Crosby b6f3cebe53 Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
Upstream-commit: 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Component: engine
 2014-11-24 12:10:45 -08:00
Jessie Frazelle a44a158249 Merge pull request #9290 from vaijab/registry-address 
registry: fix ServerAddress setting
Upstream-commit: fefaf6a73db52b6d20774f049d7456e2ba6ff5ca
Component: engine
 2014-11-24 12:02:12 -08:00
Jessie Frazelle 5c76d436ac Merge pull request #9312 from daehyeok/deprecated_cmd 
remove deprecated cmd function in integration-cli
Upstream-commit: 66266a0ed94de5099d9ca75ecd6b3bc05c559e78
Component: engine
 2014-11-24 11:58:13 -08:00
Michael Crosby 856affc265 Merge pull request #9303 from rmetzler/patch-1 
Empty Line should fix Markdown unordered list
Upstream-commit: cbc401ccfac7e044f3f4043990c7a7a93ed41874
Component: engine
 2014-11-24 11:55:21 -08:00
Vaidas Jablonskis c33d4c9307 registry: fix ServerAddress setting 
This ensures that ServerAddress is set, while previously it was getting
set after configFile.Configs.

Signed-off-by: Vaidas Jablonskis <jablonskis@gmail.com>
Upstream-commit: d96832cbd2c62103944518866e1fc1219ce048d5
Component: engine
 2014-11-24 18:26:41 +00:00
Dmitry V. Krivenok bb8eca9ba7 Made wording a bit more generic. 
Upstream-commit: 5deedef42c7d85835729ecf4fe61ec91612089af
Component: engine
 2014-11-24 21:22:54 +03:00
Daehyeok Mun 09af87d0eb remove deprecated cmd function in integration-cli 
Remove deprecated cmd function in integration-cli
and change cmd to dockerCmd in all test files

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: 7fbbd515b1018721e91199960d1933383a8262a1
Component: engine
 2014-11-25 00:32:38 +09:00
Richard Metzler ea8fa13170 Empty Line should fix Markdown unordered list 
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
 2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok 9509d05af6 Fixed typo in documentation. 
Upstream-commit: 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Component: engine
 2014-11-23 22:59:35 +03:00
Vincent Bernat b226fef09a zsh: correctly parse available subcommands 
A lot of flags have been added on the output of `docker help`. Use a
more robust method to extract the list of available subcommands by
spotting the `Command:` line and the next blank line.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 34fe2a372576907cb7ec26cf22ac4e93b8974f6e
Component: engine
 2014-11-23 00:45:14 +01:00
Jessie Frazelle 8bf9a8d42c Merge pull request #9223 from vbatts/vbatts-overlay_notfound 
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
 2014-11-21 19:58:01 -08:00
Brian Goff 1f85619ac6 Cleanup exec API docs and available params 
Adds pertitent information about what is expected in the json payload
and comments out unsupported (exec) features in runConfig.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
 2014-11-21 21:11:07 -05:00
Jessie Frazelle 17175863b2 Merge pull request #9188 from somaopensource/8777-fix 
Fix for #8777 (continuing PR #9061)
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
 2014-11-21 17:57:56 -08:00
Michael Crosby 5f6e6e9df3 Merge pull request #9183 from vbatts/dm_udevwait 
devmapper: Call UdevWait() even in failure path
Upstream-commit: fb1540199e2a7fb8aaf7918a9a35d1f21adeaad5
Component: engine
 2014-11-21 17:28:37 -08:00
Vincent Batts 354971bf12 Merge pull request #9267 from crosbymichael/devmapper-mknod 
Mknod more loopbacks for devmapper
Upstream-commit: 104d27a07b78f1a029e60b69a4488132982ae12e
Component: engine
 2014-11-21 20:23:43 -05:00
Michael Crosby 664428ef8f Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests 
pkg/tarsum: adding more tests
Upstream-commit: e820365b677cff6a5f3b073da1a3ebb21e5f8247
Component: engine
 2014-11-21 17:12:55 -08:00
Michael Crosby 5e63676399 Merge pull request #9185 from djmaze/patch-1 
Fix link to MAINTAINERS.md in CONTRIBUTING.md
Upstream-commit: 496db275d540d754774d4e2867bdcb666464af20
Component: engine
 2014-11-21 16:40:27 -08:00
Michael Crosby 0c37aeb40b Mknod more loopbacks for devmapper 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f8509e7940d73ecc0071faf15a865acb1f8dad52
Component: engine
 2014-11-21 16:20:35 -08:00
Martin Honermeyer c20c704755 Fix link to MAINTAINERS.md in CONTRIBUTING.md 
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
Upstream-commit: 20218f39718673d3ae5822aeecfd08ea0c6e8126
Component: engine
 2014-11-22 01:18:40 +01:00
unclejack d66b329d87 Merge pull request #9270 from jfrazelle/8919-tag-output 
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
 2014-11-22 01:56:31 +02:00
Michael Crosby 21eb3ab253 Merge pull request #9265 from vieux/daemon_labels 
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
 2014-11-21 15:14:27 -08:00
Tibor Vass 8aeb562625 Merge pull request #9158 from tianon/minor-makefile-preamble-reorg 
Add some minor reorganization to the Makefile preamble
Upstream-commit: 17ba356e9a291e5d128d8b6f6c4a8f2b9f1f1778
Component: engine
 2014-11-21 18:02:11 -05:00
Tianon Gravi 7eeacf5615 Add some minor reorganization to the Makefile preamble 
The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Component: engine
 2014-11-21 15:49:09 -07:00
Sven Dowideit 50546730f2 Merge pull request #9209 from SvenDowideit/shared-disk-space-images 
If an image has more than one repo name or tag, it'll be listed more tha...
Upstream-commit: 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Component: engine
 2014-11-21 14:07:45 -08:00
Vincent Batts 95c96f42c9 Merge pull request #9149 from swagiaal/fix-configureBridge-comment 
Remove reference to 'ifaceName' from configureBridge comment.
Upstream-commit: a43ee077dca75d0e8f198275db17eac341b0ca8c
Component: engine
 2014-11-21 16:37:28 -05:00
Vincent Batts 6951abbd89 Merge pull request #9009 from a-ba/fix-export-repo 
fix missing layers when exporting a full repository 
Upstream-commit: a5277764aed9e5493387a6f4caf2bb93a0a6afa3
Component: engine
 2014-11-21 15:44:27 -05:00
Victor Vieux eec853d8c5 key=values -> key=value 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 62a7d75512d939a86cbc58986278548df3302902
Component: engine
 2014-11-21 19:15:22 +00:00
unclejack 19f9fcbc25 build: add pull flag to force image pulling 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
 2014-11-21 19:59:44 +02:00
Alexander Morozov 8d3c39cea7 Merge pull request #9261 from unclejack/fix_test_tmp_cleanup 
fix cleanup of /tmp in tests
Upstream-commit: 0f2de5158fe66b4906de176f90e3e6d813336450
Component: engine
 2014-11-21 08:48:04 -08:00
Arnaud Porterie f702226e49 Merge pull request #9225 from icecrime/win_make_binary 
Adapt project/make.sh for Windows builds
Upstream-commit: ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Component: engine
 2014-11-21 08:37:19 -08:00
unclejack 2388eefc7e graphdriver/aufs: fix tmp cleanup in tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4180579313e84ea7e3d85214521a815e95459a90
Component: engine
 2014-11-21 18:31:45 +02:00
Alexander Morozov 8e044d3796 Merge pull request #9271 from jfrazelle/iptables-errors 
Typed errors for iptables chain raw command output. YAYYYYYY.
Upstream-commit: e3f3259e006e955d2a280d9f37451b5813657b4a
Component: engine
 2014-11-20 19:03:38 -08:00
Jessica Frazelle c878d4a442 Apply same typed iptables errors to network driver. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f6c7194539720473aae814d3d1445eab2a78d568
Component: engine
 2014-11-20 18:07:15 -08:00
Jessica Frazelle cbc7790607 Typed errors for iptables chain raw command output. YAYYYYYY. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6cc75574b3b01fa4dfeeef585e52dbcf8da28586
Component: engine
 2014-11-20 18:07:11 -08:00
Michael Crosby b4f3f7d0fc Merge pull request #9259 from duglin/Issue9221 
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
 2014-11-20 17:41:31 -08:00
Michael Crosby 3d66822e1d Merge pull request #9248 from vbatts/vbatts-fix_gh9241 
pkg/tarsum: actually init the TarSum struct
Upstream-commit: 5d67a3faea400273e4307db7990a51fc2d2ca0dc
Component: engine
 2014-11-20 17:15:15 -08:00
unclejack 73a99e1a72 Merge pull request #9269 from crosbymichael/update-libcontainer-nov20 
Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd
Upstream-commit: 5cde77d003892fa20f82f9bf586c7623494d6cbf
Component: engine
 2014-11-21 02:50:04 +02:00
Doug Davis f7e2fcdfb9 Make --tlsverify enable tls regardless of value specified 
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.

Per #9221 - also tweaked the docs to fix a typo.

Closes #9221

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
 2014-11-20 16:09:06 -08:00