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
1eb5e5d25f
Merge pull request #9030 from cpuguy83/cleanup_host_parser
...
Cleanup ParseHost
2014-11-25 16:15:48 -08:00
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
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
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
93be7c0e52
Merge pull request #9262 from rhatdan/debug
...
Allow developers to build docker with debuginfo included
2014-11-25 14:21:00 -08:00
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
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
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
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
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
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
4dd3368b51
docs: Add 1.3.2 release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-25 03:02:27 +02:00
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
2ad98b0cfa
Merge pull request #9324 from crosbymichael/git-urls
...
Move IsGIT and IsURL to urlutil package
2014-11-24 16:07:42 -08:00
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
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
5794b5373e
Update code for use of urlutil pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-24 18:47:42 -05:00
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
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
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
f6d9780229
archive: do not call FollowSymlinkInScope in createTarFile
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-11-25 01:03:41 +02:00
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
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
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
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
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
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
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
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
Erik Hollensbe
Michael Crosby
Brian Goff
unclejack
unclejack
Dan Walsh
Jessie Frazelle
Harald Albers
Tibor Vass
Michael Crosby
Victor Vieux
Aidan Hobson Sayers
Tianon Gravi
Vaidas Jablonskis
Dmitry V. Krivenok
Daehyeok Mun
Richard Metzler
Vincent Bernat
Doug Davis