aba2469af0
Merge pull request #9224 from tianon/custom-debootstrap
...
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
Upstream-commit: 27127437a6249bbf6f70707ff681992eb00ac47b
Component: engine
2014-11-24 18:11:59 -08:00
0e537abc04
docs: Add 1.3.2 release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 4dd3368b51b2b00936f91fcc951d81d0c0d918ae
Component: engine
2014-11-25 03:02:27 +02:00
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
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
f5cd7e9948
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 >
Upstream-commit: b21e1d4a00f2687ef24aa47039ac2f0281294365
Component: engine
2014-11-25 02:07:01 +02:00
e2ca84e5a6
graph/load: add build tags to fix make cross
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 2ec2237909ba51d3fe10a2ee6cfb81f315408f68
Component: engine
2014-11-25 02:06:45 +02:00
033a9598e5
Update code for use of urlutil pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5794b5373ef26846b3cc5e48e651208771d12b19
Component: engine
2014-11-24 18:47:42 -05:00
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
9b15d918d9
Merge pull request #9289 from duglin/mflagSetTest
...
Add missing unit testcase for new IsSet() func in mflag
Upstream-commit: 4996d46a365f9999c9db58dd7bf63d314ff8e87f
Component: engine
2014-11-24 15:26:25 -08:00
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
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
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
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
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
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
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
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
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
3527869dfc
Add AppArmorProfile to container inspect json
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: fa1484d12c5b66f7db03a9c93002ba3df56cdb4e
Component: engine
2014-11-25 01:03:40 +02:00
8c7a6654fa
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
Upstream-commit: 294843ef23fcff3c080d9fbd12df17ae7006a9f8
Component: engine
2014-11-25 01:02:30 +02:00
d74ab85d73
Merge pull request #9162 from aidanhs/patch-1
...
Allow git@ urls for more than just github
Upstream-commit: df7c22dd2307cb530b300a84ae9ddcc951dc3e47
Component: engine
2014-11-24 14:51:52 -08:00
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
d700b94cc1
Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api
...
Cleanup exec API docs and available params
Upstream-commit: 39284be960d3d528ecf3faaa7900f4718e959c06
Component: engine
2014-11-24 13:35:45 -08:00
85fb88371f
Allow git@ prefixes for any hosted git service
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: c7e4cc4a531b5337d64bda22df8553e646a96fe7
Component: engine
2014-11-24 20:49:54 +00:00
1705df26bc
Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2
...
zsh: correctly parse available subcommands (completion)
Upstream-commit: 748fe7a0fa8df73d89df729ce307c24ac881ae1e
Component: engine
2014-11-24 13:36:58 -07:00
4704f56d5d
Merge pull request #9301 from krivenok/master
...
Fixed typo in documentation.
Upstream-commit: b4757445ae5dd4de63d793d2c54232d5254b7a9c
Component: engine
2014-11-24 12:27:56 -08:00
b6f3cebe53
Merge pull request #9281 from unclejack/build_pull_flag
...
build: add pull flag to force image pulling
Upstream-commit: 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Component: engine
2014-11-24 12:10:45 -08:00
a44a158249
Merge pull request #9290 from vaijab/registry-address
...
registry: fix ServerAddress setting
Upstream-commit: fefaf6a73db52b6d20774f049d7456e2ba6ff5ca
Component: engine
2014-11-24 12:02:12 -08:00
5c76d436ac
Merge pull request #9312 from daehyeok/deprecated_cmd
...
remove deprecated cmd function in integration-cli
Upstream-commit: 66266a0ed94de5099d9ca75ecd6b3bc05c559e78
Component: engine
2014-11-24 11:58:13 -08:00
c33d4c9307
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 >
Upstream-commit: d96832cbd2c62103944518866e1fc1219ce048d5
Component: engine
2014-11-24 18:26:41 +00:00
bb8eca9ba7
Made wording a bit more generic.
...
Upstream-commit: 5deedef42c7d85835729ecf4fe61ec91612089af
Component: engine
2014-11-24 21:22:54 +03:00
09af87d0eb
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 >
Upstream-commit: 7fbbd515b1018721e91199960d1933383a8262a1
Component: engine
2014-11-25 00:32:38 +09:00
ea8fa13170
Empty Line should fix Markdown unordered list
...
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
2014-11-23 23:57:43 +01:00
9509d05af6
Fixed typo in documentation.
...
Upstream-commit: 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Component: engine
2014-11-23 22:59:35 +03:00
b226fef09a
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 >
Upstream-commit: 34fe2a372576907cb7ec26cf22ac4e93b8974f6e
Component: engine
2014-11-23 00:45:14 +01:00
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
8bf9a8d42c
Merge pull request #9223 from vbatts/vbatts-overlay_notfound
...
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
2014-11-21 19:58:01 -08:00
1f85619ac6
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 >
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
2014-11-21 21:11:07 -05:00
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
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
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
354971bf12
Merge pull request #9267 from crosbymichael/devmapper-mknod
...
Mknod more loopbacks for devmapper
Upstream-commit: 104d27a07b78f1a029e60b69a4488132982ae12e
Component: engine
2014-11-21 20:23:43 -05:00
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
5e63676399
Merge pull request #9185 from djmaze/patch-1
...
Fix link to MAINTAINERS.md in CONTRIBUTING.md
Upstream-commit: 496db275d540d754774d4e2867bdcb666464af20
Component: engine
2014-11-21 16:40:27 -08:00
0c37aeb40b
Mknod more loopbacks for devmapper
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f8509e7940d73ecc0071faf15a865acb1f8dad52
Component: engine
2014-11-21 16:20:35 -08:00
c20c704755
Fix link to MAINTAINERS.md in CONTRIBUTING.md
...
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de >
Upstream-commit: 20218f39718673d3ae5822aeecfd08ea0c6e8126
Component: engine
2014-11-22 01:18:40 +01:00
d66b329d87
Merge pull request #9270 from jfrazelle/8919-tag-output
...
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
2014-11-22 01:56:31 +02:00
21eb3ab253
Merge pull request #9265 from vieux/daemon_labels
...
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
2014-11-21 15:14:27 -08:00
7eeacf5615
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 >
Upstream-commit: 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Component: engine
2014-11-21 15:49:09 -07:00
50546730f2
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...
Upstream-commit: 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Component: engine
2014-11-21 14:07:45 -08:00
