p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,788 Commits 2 Branches 295 Tags
326fa034ea8346d7009fd026b811cb7907adbb95
Commit Graph

866 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Doug Davis
5dbc13abb8 Add missing unit testcase for new IsSet() func in mflag 
Forgot to add this when I did PR #9259

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 88afbc4d94c4a803e936d602c620b8ab08e24acd
Component: engine
 2014-11-22 05:37:36 -08: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
Vincent Batts
e029685ee4 pkg/devicemapper: clarify TaskCreate and createTask 
* Rename and expose createTask() to TaskCreateNamed()
* add comments

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: acdf766069f8e8c65fd3de3ce4f8efc15f421abd
Component: engine
 2014-11-21 20:54:50 -05: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
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
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
Yohei Ueda
5192262c8e Use termios via CGO 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: 244af451e9bdff5c87bca84e4c15193fc9eebc64
Component: engine
 2014-11-21 22:12:03 +09: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
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
Michael Crosby
0f9991ec4d Revert "Support hairpin NAT" 
This reverts commit 95a400e6e1a3b5da68431e64f9902a3fac218360.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 56c37536315d4c63c35b766e3335034e488e2189
Component: engine
 2014-11-20 14:22:32 -08:00
unclejack
39f1feb541 pkg/symlink: fix cleanup for tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4508bd94b0efd07a0ef48cd090786615e6b8cbb7
Component: engine
 2014-11-20 19:36:54 +02:00
unclejack
86c00287ea pkg/archive: fix TempArchive cleanup w/ one read 
This fixes the removal of TempArchives which can read with only one
read. Such archives weren't getting removed because EOF wasn't being
triggered.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 32ba6ab83c7e47d627a2b971e7f6ca9b56e1be85
Component: engine
 2014-11-20 19:34:35 +02:00
unclejack
42efcf2e21 pkg/system: fix cleanup in tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 769b79866aa645d4deeeb0a44120cde7b046f0d1
Component: engine
 2014-11-20 19:33:15 +02:00
Oh Jinkyun
313de46eb6 Fix for #8777 
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
Upstream-commit: 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Component: engine
 2014-11-20 13:36:46 +09:00
Josh Hawn
b6be906192 Add unit test for tarSum.Sum() with no data 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: e257863a9a2bff19c66355230483a8b6fa9de209
Component: engine
 2014-11-19 15:55:21 -05:00
Vincent Batts
3898f51483 pkg/tarsum: actually init the TarSum struct 
closes #9241

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 6a74f071afb4a69a1360ff1e84945745e578c349
Component: engine
 2014-11-19 15:46:03 -05:00
Michael Crosby
00bf60f5c4 Merge pull request #8937 from vbatts/vbatts-mount_optional_fields 
pkg/mount: include optional field
Upstream-commit: 379c0da4648f7a8d62740b5c217cfac58f45ca10
Component: engine
 2014-11-17 18:25:00 -08:00
Vincent Batts
71912fc9e2 pkg/mount: testing mountinfo fields 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 83d7db3e505f2d080ac78ca7777937c812588003
Component: engine
 2014-11-17 16:17:06 -05:00
Vivek Goyal
75da15eccc devmapper: Call UdevWait() even in failure path 
Currently we set up a cookie and upon failure not call UdevWait(). This
does not cleanup the cookie and associated semaphore and system will
soon max out on total number of semaphores.

To avoid this, call UdevWait() even in failure path which in turn will
cleanup associated semaphore.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: edc6df256d21eb1d1aa36b241dcc6d4b83d58d75
Component: engine
 2014-11-15 09:41:27 -05:00
Ahmet Alp Balkan
46e167f95c Refactor pkg/archive with a platform-independent stat struct 
pkg/archive contains code both invoked from cli (cross platform) and
daemon (linux only) and Unix-specific dependencies break compilation on
Windows. We extracted those stat-related funcs into platform specific
implementations at pkg/system and added unit tests.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 2180aa4f6f2ad4d8f284d63ee29e93547263976e
Component: engine
 2014-11-14 18:20:54 -08:00
Ahmet Alp Balkan
39256638f6 Extract mknod, umask, lstat to pkg/system 
Some parts of pkg/archive is called on both client/daemon code. To get
it compiling on Windows, these funcs are extracted into files with
build tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 3d2fae353f6ddc819d3a3c4db80887a40ac6f5f0
Component: engine
 2014-11-14 18:20:54 -08:00
Ahmet Alp Balkan
2e7196248a Extract client signals to pkg/signal 
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
 2014-11-14 18:20:53 -08:00
John Gossman
4c601bc6dd Refactor pkg/term package for Windows tty support 
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 975b6e598d44408c865993bbb650cc7117133ffc
Component: engine
 2014-11-14 18:20:53 -08:00
Michael Crosby
4faf5170e1 Merge pull request #9164 from vbatts/vbatts-dm_removedevice 
pkg/devicemapper: cleanup removeDevice differences
Upstream-commit: c89062bafc2262c5efeee905bafb72be57873478
Component: engine
 2014-11-14 16:56:02 -08:00
Michael Crosby
5e6c6e4025 Merge pull request #9172 from vbatts/vbatts-dm_maintainer 
pkg/devicemapper: missed MAINTAINERS on split
Upstream-commit: 25643f8932eeaa33b67871247b2f19944a169831
Component: engine
 2014-11-14 13:29:34 -08:00
Vincent Batts
b34358b506 pkg/devicemapper: defer udev wait during removal 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: cef27e1d6c0bd302e1c58e9478a0fba99fd3a2d0
Component: engine
 2014-11-14 15:17:33 -05:00
Vincent Batts
6149f196a8 pkg/devicemapper: missed MAINTAINERS on split 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 3ec623ee2fc503a6236a7b0edde5dd6abb967e49
Component: engine
 2014-11-14 11:12:23 -05:00
Vincent Batts
4798207faf pkg/devicemapper: cleanup removeDevice differences 
Fixes failure on RemoveDevice when host is AUFS, and running
devicemapper test docker-in-docker

https://gist.github.com/tonistiigi/59559cbfb3f2df26b29c

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: c9a76622086cf6019b3ec71ae53fc71c0396a1ef
Component: engine
 2014-11-13 22:43:03 -05:00
unclejack
4189659614 Merge pull request #8869 from jlhawn/tarsum_version 
Finalize TarSum Version 1 w/ refactor
Upstream-commit: 3aa2245914ea73f19838adbb09d0617984fbeb11
Component: engine
 2014-11-14 01:12:22 +02:00
Michael Crosby
007506732f Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields 
pkg/mount: adding fields supported by freebsd
Upstream-commit: b9fb9787b6db5332944d9d0f1fc42eae77d34b7d
Component: engine
 2014-11-13 11:54:16 -08:00
Michael Crosby
3b4007ccd1 Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree 
pkg/mount: sharedsubtree options and testing
Upstream-commit: e4105e4535de0ddb1a0e3ddbc646429c5c8ab5ec
Component: engine
 2014-11-13 11:26:29 -08:00