clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,120 Commits 9 Branches 112 Tags
9256578f62ffe885befa3ef2dbdd9ec0bea1d7e8
Commit Graph
12120 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tibor Vass 6f514d28c0 Merge pull request #9316 from tiborvass/bump_v1.3.2 
Bump v1.3.2
 2014-11-24 16:49:28 -05: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
Jessie Frazelle fefaf6a73d Merge pull request #9290 from vaijab/registry-address 
registry: fix ServerAddress setting
 2014-11-24 12:02:12 -08:00
Jessie Frazelle 66266a0ed9 Merge pull request #9312 from daehyeok/deprecated_cmd 
remove deprecated cmd function in integration-cli
 2014-11-24 11:58:13 -08:00
Michael Crosby cbc401ccfa Merge pull request #9303 from rmetzler/patch-1 
Empty Line should fix Markdown unordered list
 2014-11-24 11:55:21 -08:00
Vincent Batts e07daa58d9 contrib: fix the docker-device-tool 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-11-24 13:49:09 -05:00
Vaidas Jablonskis d96832cbd2 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>
 2014-11-24 18:26:41 +00:00
Dmitry V. Krivenok 5deedef42c Made wording a bit more generic. 2014-11-24 21:22:54 +03:00
Tibor Vass 39fa2faad2 Bump to version v1.3.2 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
v1.3.2 		2014-11-24 12:38:01 -05:00
Tibor Vass 324953d74a docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-24 12:38:01 -05:00
Tibor Vass b256616589 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-24 11:51:37 -05:00
unclejack 409f65bfd1 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-24 11:51:37 -05:00
Daehyeok Mun 7fbbd515b1 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>
 2014-11-25 00:32:38 +09:00
Richard Metzler 91a8b916b0 Empty Line should fix Markdown unordered list 
Without the line break the list would render as one single paragraph.
 2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok 745e3f77a1 Fixed typo in documentation. 2014-11-23 22:59:35 +03:00
Vincent Bernat 34fe2a3725 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>
 2014-11-23 00:45:14 +01:00
Doug Davis 88afbc4d94 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>
 2014-11-22 05:37:36 -08:00
James Mills 30979ad5a0 Updated installation docs for CRUX as a Docker Host. 
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
 2014-11-22 17:18:11 +10:00
Jessie Frazelle c59b308b6b Merge pull request #9223 from vbatts/vbatts-overlay_notfound 
overlayfs: more helpful output when not supported
 2014-11-21 19:58:01 -08:00
Mike Snitzer 553b50bd37 devmapper: remove unnecessary else branch in getPoolName() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
 2014-11-21 21:36:23 -05:00
Brian Goff d4ba00bd42 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>
 2014-11-21 21:11:07 -05:00
Jessie Frazelle d7626e97b6 Merge pull request #9188 from somaopensource/8777-fix 
Fix for #8777 (continuing PR #9061)
 2014-11-21 17:57:56 -08:00
Vincent Batts acdf766069 pkg/devicemapper: clarify TaskCreate and createTask 
* Rename and expose createTask() to TaskCreateNamed()
* add comments

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-21 20:54:50 -05:00
Michael Crosby fb1540199e Merge pull request #9183 from vbatts/dm_udevwait 
devmapper: Call UdevWait() even in failure path
 2014-11-21 17:28:37 -08:00
Vincent Batts 104d27a07b Merge pull request #9267 from crosbymichael/devmapper-mknod 
Mknod more loopbacks for devmapper
 2014-11-21 20:23:43 -05:00
Michael Crosby e820365b67 Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests 
pkg/tarsum: adding more tests
 2014-11-21 17:12:55 -08:00
Michael Crosby 496db275d5 Merge pull request #9185 from djmaze/patch-1 
Fix link to MAINTAINERS.md in CONTRIBUTING.md
 2014-11-21 16:40:27 -08:00
Michael Crosby f8509e7940 Mknod more loopbacks for devmapper 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-21 16:20:35 -08:00
Martin Honermeyer 20218f3971 Fix link to MAINTAINERS.md in CONTRIBUTING.md 
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
 2014-11-22 01:18:40 +01:00
unclejack 07b7bdb4fc Merge pull request #9270 from jfrazelle/8919-tag-output 
Output image with tag name when image is not found
 2014-11-22 01:56:31 +02:00
Michael Crosby c78bf8d86a Merge pull request #9265 from vieux/daemon_labels 
add daemon labels (displayed in docker info)
 2014-11-21 15:14:27 -08:00
Tibor Vass 17ba356e9a Merge pull request #9158 from tianon/minor-makefile-preamble-reorg 
Add some minor reorganization to the Makefile preamble
 2014-11-21 18:02:11 -05:00
Tianon Gravi 82f33d86a7 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>
 2014-11-21 15:49:09 -07:00
Sven Dowideit 44159f38d2 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...
 2014-11-21 14:07:45 -08:00
Vincent Batts a43ee077dc Merge pull request #9149 from swagiaal/fix-configureBridge-comment 
Remove reference to 'ifaceName' from configureBridge comment.
 2014-11-21 16:37:28 -05:00
Vincent Batts a5277764ae Merge pull request #9009 from a-ba/fix-export-repo 
fix missing layers when exporting a full repository
 2014-11-21 15:44:27 -05:00
Victor Vieux 62a7d75512 key=values -> key=value 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-21 19:15:22 +00:00
unclejack 054e57a622 build: add pull flag to force image pulling 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-21 19:59:44 +02:00