31d1d73303
archive: prevent breakout in ApplyLayer
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-25 01:03:41 +02:00
1852cc3841
archive: prevent breakout in Untar
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-25 01:03:41 +02:00
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
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
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
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
fa1484d12c
Add AppArmorProfile to container inspect json
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-25 01:03:40 +02:00
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
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
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
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
b4757445ae
Merge pull request #9301 from krivenok/master
...
Fixed typo in documentation.
2014-11-24 12:27:56 -08:00
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
fefaf6a73d
Merge pull request #9290 from vaijab/registry-address
...
registry: fix ServerAddress setting
2014-11-24 12:02:12 -08:00
66266a0ed9
Merge pull request #9312 from daehyeok/deprecated_cmd
...
remove deprecated cmd function in integration-cli
2014-11-24 11:58:13 -08:00
cbc401ccfa
Merge pull request #9303 from rmetzler/patch-1
...
Empty Line should fix Markdown unordered list
2014-11-24 11:55:21 -08:00
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
5deedef42c
Made wording a bit more generic.
2014-11-24 21:22:54 +03:00
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
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
745e3f77a1
Fixed typo in documentation.
2014-11-23 22:59:35 +03:00
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
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
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
d7626e97b6
Merge pull request #9188 from somaopensource/8777-fix
...
Fix for #8777 (continuing PR #9061 )
2014-11-21 17:57:56 -08:00
fb1540199e
Merge pull request #9183 from vbatts/dm_udevwait
...
devmapper: Call UdevWait() even in failure path
2014-11-21 17:28:37 -08:00
104d27a07b
Merge pull request #9267 from crosbymichael/devmapper-mknod
...
Mknod more loopbacks for devmapper
2014-11-21 20:23:43 -05:00
e820365b67
Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests
...
pkg/tarsum: adding more tests
2014-11-21 17:12:55 -08:00
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
f8509e7940
Mknod more loopbacks for devmapper
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-21 16:20:35 -08:00
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
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
c78bf8d86a
Merge pull request #9265 from vieux/daemon_labels
...
add daemon labels (displayed in docker info)
2014-11-21 15:14:27 -08:00
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
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
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
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
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
62a7d75512
key=values -> key=value
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-21 19:15:22 +00:00
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
0f2de5158f
Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
...
fix cleanup of /tmp in tests
2014-11-21 08:48:04 -08:00
ce8ebaf0e0
Merge pull request #9225 from icecrime/win_make_binary
...
Adapt project/make.sh for Windows builds
2014-11-21 08:37:19 -08:00
4180579313
graphdriver/aufs: fix tmp cleanup in tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-21 18:31:45 +02:00
e3f3259e00
Merge pull request #9271 from jfrazelle/iptables-errors
...
Typed errors for iptables chain raw command output. YAYYYYYY.
2014-11-20 19:03:38 -08:00
f6c7194539
Apply same typed iptables errors to network driver.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-20 18:07:15 -08:00
6cc75574b3
Typed errors for iptables chain raw command output. YAYYYYYY.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-20 18:07:11 -08:00
532e502e9c
Merge pull request #9259 from duglin/Issue9221
...
Make --tlsverify enable tls regardless of value specified
2014-11-20 17:41:31 -08:00
5d67a3faea
Merge pull request #9248 from vbatts/vbatts-fix_gh9241
...
pkg/tarsum: actually init the TarSum struct
2014-11-20 17:15:15 -08:00
5cde77d003
Merge pull request #9269 from crosbymichael/update-libcontainer-nov20
...
Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd
2014-11-21 02:50:04 +02:00
ae9bd580af
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>
2014-11-20 16:09:06 -08:00
Tibor Vass
unclejack
Michael Crosby
Jessie Frazelle
Tianon Gravi
Michael Crosby
Vaidas Jablonskis
Dmitry V. Krivenok
Daehyeok Mun
Richard Metzler
Vincent Bernat
Brian Goff
Vincent Batts
Martin Honermeyer
unclejack
Sven Dowideit
Victor Vieux
Alexander Morozov
Arnaud Porterie
Jessica Frazelle
Doug Davis