clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-27 11:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,805 Commits 9 Branches 112 Tags
b47ff77b5ce852bd830bc617d1c4e2c37e346281
Commit Graph

11805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Batts b47ff77b5c Merge pull request #9006 from snitm/thin-pool-improvements 
Thin pool improvements
 2014-11-26 14:44:09 -05:00
Michael Crosby 75b47467aa Merge pull request #9346 from jfrazelle/fix-events-test 
fix tests where cmd function does not exist
 2014-11-25 18:53:08 -08:00
Jessica Frazelle 8635b0248a fix where cmd function dne 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-11-25 18:34:08 -08:00
Jessie Frazelle 00c2a8f323 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
 2014-11-25 18:03:51 -08:00
Jessie Frazelle 9160e01cef Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
 2014-11-25 17:52:27 -08:00
Doug Davis 90928eb114 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>
 2014-11-25 17:49:25 -08:00
Michael Crosby 6a0177ed2e Merge pull request #8767 from erikh/update_parents_hosts_part2 
Links test cleanup
 2014-11-25 17:17:35 -08:00
Vincent Batts 79064a2820 Merge pull request #9279 from yoheiueda/termios-via-cgo 
Use termios via CGO
 2014-11-25 20:04:26 -05:00
Erik Hollensbe 68bc8de111 Test for updating hosts files via links. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-11-25 16:48:36 -08:00
Erik Hollensbe 20575d20ba 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)
 2014-11-25 16:46:09 -08:00
Michael Crosby 1eb5e5d25f Merge pull request #9030 from cpuguy83/cleanup_host_parser 
Cleanup ParseHost
 2014-11-25 16:15:48 -08:00
Victor Vieux f0f0e316aa fix tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-26 00:00:56 +00:00
Brian Goff bd4fe9b986 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>
 2014-11-25 18:55:40 -05:00
unclejack 1dadc51adc Merge pull request #9342 from unclejack/add_tarsum_maintainers 
pkg/tarsum: add maintainers & add missing s
 2014-11-26 01:45:51 +02:00
unclejack 3db5ea1617 pkg/tarsum: add maintainers & add missing s 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-26 00:44:16 +02:00
Michael Crosby 93be7c0e52 Merge pull request #9262 from rhatdan/debug 
Allow developers to build docker with debuginfo included
 2014-11-25 14:21:00 -08:00
Dan Walsh 61586414ca Merge branch 'master' of github.com:docker/docker into debug 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-11-25 14:09:19 -05:00
Jessie Frazelle 7ebcdad030 Merge pull request #9238 from albers/bash-completion 
Add missing options to bash completion for the run and create commands
 2014-11-25 09:27:31 -08:00
Yohei Ueda dfcf05a5d0 Use termios via CGO only on Linux 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
 2014-11-25 20:49:01 +09:00
Harald Albers eac9f2e5c4 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>
 2014-11-25 08:53:13 +01:00
Harald Albers 2e863e8a38 Add missing options to bash completion for the run and create commands 
Signed-off-by: Harald Albers <github@albersweb.de>
 2014-11-25 08:53:12 +01:00
Jessie Frazelle 27127437a6 Merge pull request #9224 from tianon/custom-debootstrap 
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
 2014-11-24 18:11:59 -08:00
Mike Snitzer b9f1b0a751 devmapper: cleanup some extraneous branching in setupBaseImage() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
 2014-11-24 20:06:41 -05:00
Tibor Vass 498985a039 Merge pull request #9325 from unclejack/add_1.3.2_relnotes 
docs: Add 1.3.2 release notes
 2014-11-24 20:06:34 -05:00
Tibor Vass 4dd3368b51 docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 03:02:27 +02:00
Tibor Vass e6ec703df3 Merge pull request #9323 from unclejack/merge_release_v1.3.2 
Merge release v1.3.2 to master
 2014-11-24 19:26:36 -05:00
Jessie Frazelle 2ad98b0cfa Merge pull request #9324 from crosbymichael/git-urls 
Move IsGIT and IsURL to urlutil package
 2014-11-24 16:07:42 -08:00
Tibor Vass b21e1d4a00 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>
 2014-11-25 02:07:01 +02:00
unclejack 2ec2237909 graph/load: add build tags to fix make cross 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-25 02:06:45 +02:00
Michael Crosby 5794b5373e Update code for use of urlutil pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-24 18:47:42 -05:00
Michael Crosby fc66a22df6 Merge pull request #9173 from vbatts/vbatts-dm_clarify_TaskCreate 
pkg/devicemapper: clarify TaskCreate and createTask
 2014-11-24 15:45:54 -08:00
Victor Vieux 4996d46a36 Merge pull request #9289 from duglin/mflagSetTest 
Add missing unit testcase for new IsSet() func in mflag
 2014-11-24 15:26:25 -08:00
Michael Crosby feca1b1780 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>
 2014-11-24 18:10:37 -05:00
Tibor Vass f6d9780229 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
unclejack 330171e1d9 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-25 01:03:41 +02:00
Tibor Vass 31d1d73303 archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
Tibor Vass 1852cc3841 archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
Tibor Vass 221617dbcd 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
 2014-11-25 01:03:41 +02:00
unclejack 209deff963 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
 2014-11-25 01:03:40 +02:00
Tibor Vass 9c01bc249d pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	graph/load.go
		fixed conflict in imports
 2014-11-25 01:03:40 +02:00
unclejack 1cb17f03d0 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
 2014-11-25 01:03:40 +02:00
Michael Crosby fa1484d12c Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-25 01:03:40 +02:00
Michael Crosby 294843ef23 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
 2014-11-25 01:02:30 +02:00
Michael Crosby df7c22dd23 Merge pull request #9162 from aidanhs/patch-1 
Allow git@ urls for more than just github
 2014-11-24 14:51:52 -08:00
unclejack faab87cc36 pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-25 00:27:05 +02:00
Jessie Frazelle 39284be960 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
 2014-11-24 13:35:45 -08:00
Aidan Hobson Sayers c7e4cc4a53 Allow git@ prefixes for any hosted git service 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2014-11-24 20:49:54 +00:00
Tianon Gravi 748fe7a0fa Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2 
zsh: correctly parse available subcommands (completion)
 2014-11-24 13:36:58 -07:00
Michael Crosby b4757445ae Merge pull request #9301 from krivenok/master 
Fixed typo in documentation.
 2014-11-24 12:27:56 -08:00
Michael Crosby 5e19ecf25c Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
 2014-11-24 12:10:45 -08:00