docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
11,799 Commits 12 Branches 296 Tags
01d2e4019dc7630f95d09cc41df0fa3737ca0108
Commit Graph

11799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
01d2e4019d Merge pull request #9346 from jfrazelle/fix-events-test 
fix tests where cmd function does not exist
Upstream-commit: 75b47467aa81b203f565eef7a182f0f805d0f812
Component: engine
 2014-11-25 18:53:08 -08:00
Jessica Frazelle
484c26692a fix where cmd function dne 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 8635b0248a1166a48dbd0fbe32df7b19f4ccea62
Component: engine
 2014-11-25 18:34:08 -08:00
Jessie Frazelle
3253386751 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
 2014-11-25 18:03:51 -08:00
Jessie Frazelle
039ddfff8b Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
 2014-11-25 17:52:27 -08:00
Doug Davis
c28ef478d3 Add support for docker exec to return cmd exitStatus 
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
 2014-11-25 17:49:25 -08:00
Michael Crosby
25cbd8f774 Merge pull request #8767 from erikh/update_parents_hosts_part2 
Links test cleanup
Upstream-commit: 6a0177ed2e760bc3298eb6dbc28d325ab2e353bc
Component: engine
 2014-11-25 17:17:35 -08:00
Vincent Batts
326fa034ea Merge pull request #9279 from yoheiueda/termios-via-cgo 
Use termios via CGO
Upstream-commit: 79064a28203496c8f63510e73c32a7135f456a27
Component: engine
 2014-11-25 20:04:26 -05:00
Erik Hollensbe
2d3f0f7b70 Test for updating hosts files via links. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 68bc8de111e4faa2a16583cd45b5c0fd253a3bba
Component: engine
 2014-11-25 16:48:36 -08:00
Erik Hollensbe
8137d7940d Break some routines out of the mutable files test for future use 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 20575d20bad60172b9d1f40c9fe357b7c069f466
Component: engine
 2014-11-25 16:46:09 -08:00
Michael Crosby
826090bed0 Merge pull request #9030 from cpuguy83/cleanup_host_parser 
Cleanup ParseHost
Upstream-commit: 1eb5e5d25faac6ef175285fb8606484928309802
Component: engine
 2014-11-25 16:15:48 -08:00
Victor Vieux
267eaf906b fix tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: f0f0e316aab2c8cc6e2f0124c7bde7661a15461c
Component: engine
 2014-11-26 00:00:56 +00:00
Brian Goff
77c62b2fac Cleanup ParseHost 
Current implementation is comingling things that ought not be together.
There are _some_ similarities between parsing for the different proto
types, but they are more different than alike, making the code extremely
difficult to reason about.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: bd4fe9b9867c7633e520130b99e02798f49e6b44
Component: engine
 2014-11-25 18:55:40 -05:00
unclejack
a05c63f99c Merge pull request #9342 from unclejack/add_tarsum_maintainers 
pkg/tarsum: add maintainers & add missing s
Upstream-commit: 1dadc51adc9f8d20c4e1d20c120dfe253b61b99c
Component: engine
 2014-11-26 01:45:51 +02:00
unclejack
fb0b016635 pkg/tarsum: add maintainers & add missing s 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 3db5ea1617549bbef7f645d4ecbf482ad1f31c71
Component: engine
 2014-11-26 00:44:16 +02:00
Michael Crosby
b58a35f8fe Merge pull request #9262 from rhatdan/debug 
Allow developers to build docker with debuginfo included
Upstream-commit: 93be7c0e52894dcb7a71196a699f41bb24395d8e
Component: engine
 2014-11-25 14:21:00 -08:00
Dan Walsh
9576e39bda Merge branch 'master' of github.com:docker/docker into debug 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 61586414ca227f7c61395ccf9605f5ceece54399
Component: engine
 2014-11-25 14:09:19 -05:00
Jessie Frazelle
75c1310aa4 Merge pull request #9238 from albers/bash-completion 
Add missing options to bash completion for the run and create commands
Upstream-commit: 7ebcdad03043a5cb423aaecbc7932fea76a2f7db
Component: engine
 2014-11-25 09:27:31 -08:00
Yohei Ueda
fb15ffbdaa Use termios via CGO only on Linux 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: dfcf05a5d070823ade84ffba0e9784cdfe6d54b0
Component: engine
 2014-11-25 20:49:01 +09:00
Harald Albers
f439fe36a4 Minor bash completion cleanup 
The -n and --networking options were removed because they are
unsupported. 
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: eac9f2e5c4fa47b0ef1e064ac2bc62be6f3a3c99
Component: engine
 2014-11-25 08:53:13 +01:00
Harald Albers
3701f3bcf6 Add missing options to bash completion for the run and create commands 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2e863e8a3849f6ea34dd281aac6f8a6c700bf029
Component: engine
 2014-11-25 08:53:12 +01:00
Jessie Frazelle
aba2469af0 Merge pull request #9224 from tianon/custom-debootstrap 
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
Upstream-commit: 27127437a6249bbf6f70707ff681992eb00ac47b
Component: engine
 2014-11-24 18:11:59 -08:00
Tibor Vass
cfc5b3b8df Merge pull request #9325 from unclejack/add_1.3.2_relnotes 
docs: Add 1.3.2 release notes
Upstream-commit: 498985a0398eccafaf2e2f2668a469386e3780f1
Component: engine
 2014-11-24 20:06:34 -05:00
Tibor Vass
0e537abc04 docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4dd3368b51b2b00936f91fcc951d81d0c0d918ae
Component: engine
 2014-11-25 03:02:27 +02:00
Tibor Vass
ed716fd8a8 Merge pull request #9323 from unclejack/merge_release_v1.3.2 
Merge release v1.3.2 to master
Upstream-commit: e6ec703df31f04c3ea3a6aeb19881494a6ae58ae
Component: engine
 2014-11-24 19:26:36 -05:00
Jessie Frazelle
bb7432e3f1 Merge pull request #9324 from crosbymichael/git-urls 
Move IsGIT and IsURL to urlutil package
Upstream-commit: 2ad98b0cfa355901d345ab361160439b1a283971
Component: engine
 2014-11-24 16:07:42 -08:00
Tibor Vass
f5cd7e9948 Add v1.3.2 changelog & bump version to 1.3.2-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b21e1d4a00f2687ef24aa47039ac2f0281294365
Component: engine
 2014-11-25 02:07:01 +02:00
unclejack
e2ca84e5a6 graph/load: add build tags to fix make cross 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2ec2237909ba51d3fe10a2ee6cfb81f315408f68
Component: engine
 2014-11-25 02:06:45 +02:00
Michael Crosby
033a9598e5 Update code for use of urlutil pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5794b5373ef26846b3cc5e48e651208771d12b19
Component: engine
 2014-11-24 18:47:42 -05:00
Michael Crosby
5861a679d7 Merge pull request #9173 from vbatts/vbatts-dm_clarify_TaskCreate 
pkg/devicemapper: clarify TaskCreate and createTask
Upstream-commit: fc66a22df6c08f1434eb77991410a1359c5afa49
Component: engine
 2014-11-24 15:45:54 -08:00
Victor Vieux
9b15d918d9 Merge pull request #9289 from duglin/mflagSetTest 
Add missing unit testcase for new IsSet() func in mflag
Upstream-commit: 4996d46a365f9999c9db58dd7bf63d314ff8e87f
Component: engine
 2014-11-24 15:26:25 -08:00
Michael Crosby
e0fcb513b1 Move git and url checks into pkg 
This moves the IsGIT and IsURL functions out of the generic `utils`
package and into their own `urlutil` pkg.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: feca1b1780a0942aafc1796d1fd52026a673bf92
Component: engine
 2014-11-24 18:10:37 -05:00
Tibor Vass
0a5e96f3d3 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: f6d9780229bfa52c86762d49a7a7e644dcd8f6df
Component: engine
 2014-11-25 01:03:41 +02:00
unclejack
05d1551428 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 330171e1d9ec537d7f691fd63c697a0540589053
Component: engine
 2014-11-25 01:03:41 +02:00
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
Michael Crosby
d74ab85d73 Merge pull request #9162 from aidanhs/patch-1 
Allow git@ urls for more than just github
Upstream-commit: df7c22dd2307cb530b300a84ae9ddcc951dc3e47
Component: engine
 2014-11-24 14:51:52 -08: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
Aidan Hobson Sayers
85fb88371f Allow git@ prefixes for any hosted git service 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: c7e4cc4a531b5337d64bda22df8553e646a96fe7
Component: engine
 2014-11-24 20:49:54 +00: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