ca489c2f49
Basic --cap-add and --cap-drop support for native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 94e6dc978134b61a2b30aa9118f98f6fadd10535
Component: engine
2014-07-11 23:43:21 +00:00
dc912b3fb5
Merge pull request #6987 from vieux/fix_6863
...
Stop & Kill options for containers removal
Upstream-commit: 319f5516146bd5c9c93907ef612e96d3c3d88711
Component: engine
2014-07-11 16:22:01 -07:00
db8c3bf836
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: fe5ab5b058e33d2d8577f1803448078e8eb92345
Component: engine
2014-07-11 23:27:23 +00:00
91c66dc425
update CLI & api docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 5ba11e6890e51fd01f674160473af3ac432622c5
Component: engine
2014-07-11 23:26:08 +00:00
3853ef9c11
Add tests for rm with stop and kill options
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: d689a5e1e2633b5fd0db4ccccfb4969e03ae256b
Component: engine
2014-07-11 23:26:08 +00:00
ceab494147
Stop/Kill options for containers removal
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 78100706303efdf9a3deee0239a7dbb3a93837ec
Component: engine
2014-07-11 23:26:08 +00:00
067d7ed315
Merge pull request #6896 from vieux/add_parsing_deamon_side
...
Add repo/tag parsing on the daemon for pull and import
Upstream-commit: d53db040c867403e76915459eafbb5d7fd1d2887
Component: engine
2014-07-12 01:44:32 +03:00
c1e9ed3e53
Merge pull request #6985 from vieux/fix_api_1.14
...
bump api to 1.14 & update docs
Upstream-commit: 00c1668011d26245e73f9faeb5d461a925948b71
Component: engine
2014-07-11 15:35:25 -07:00
1e36ca4638
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: cdfdbe9bc61b157b0390bce26c4d6e41673ad495
Component: engine
2014-07-11 22:39:43 +00:00
8850edab1a
Merge pull request #6979 from LK4D4/fix_race_inspect_start
...
Use container.Lock in public ToDisk method
Upstream-commit: c3f247860aa169f4a9530d025da935d71af72f20
Component: engine
2014-07-11 13:44:01 -07:00
241e1f987c
Use container.Lock in public ToDisk method
...
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: eae5cf1e20e8d93cc13ea8e1db3cd787250fa76d
Component: engine
2014-07-11 23:31:03 +04:00
59f98ccf62
Merge pull request #6890 from huslage/tls-doc-fixes2
...
Clarification of TLS Docs
Upstream-commit: 2944d8ca3e038dd938b0b67505545b21fb2a1a6d
Component: engine
2014-07-11 14:36:24 -04:00
eaad0a8c81
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: c3d91263a867aa4ac4da6c2cad52f0505a6eccf0
Component: engine
2014-07-11 14:35:01 -04:00
73381dfd80
Merge pull request #6209 from zdover23/03_Jun_2014
...
BZ#1104401 - correcting flags in docker-commit
Upstream-commit: 7c4f7780a17db76f29e46a7cdc73538f23c6adda
Component: engine
2014-07-11 08:03:36 -04:00
8a3e9e0362
Merge pull request #6961 from crosbymichael/devices-flag
...
Add --device flag to allow additional host devices in container
Upstream-commit: 9216ced00310979d8051e516663d5c9b08656f29
Component: engine
2014-07-10 17:44:44 -07:00
c15db86f61
Add --device flag to allow additional host devices in container
...
We add a --device flag which can be used like:
docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash
To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.
Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: e855c4b92170534864b920ec1e267b3a815764f9
Component: engine
2014-07-10 10:35:53 -07:00
b57da60173
Merge pull request #6939 from snitm/thinp-blocksize-fix
...
devmapper: revert the default dm-thin-pool blocksize back to 64K
Upstream-commit: 840ed5ace28381e61b6b34063f9afb71d63fb6a9
Component: engine
2014-07-10 19:57:07 +03:00
dc19a34af4
Merge pull request #6920 from vieux/pr_6408
...
Add support for IPv6 addresses in --dns parameters.
Upstream-commit: 0c67dcb0dfbacf402f07a86b16fbfaef976d1be3
Component: engine
2014-07-10 19:16:23 +03:00
807d93f960
Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile
...
Replace ADD with COPY in Dockerfile
Upstream-commit: 85761b7fdbed26832c71447eff6de55c0035d189
Component: engine
2014-07-10 10:46:13 -04:00
abe9a19e05
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
Upstream-commit: d9265007a0f7c6e47c015b427d59b5638e1102c1
Component: engine
2014-07-10 10:29:15 +00:00
884f8c36f5
Merge pull request #6945 from fredlf/copyedit-builds
...
New screenshots and revisions to builds.md
Upstream-commit: 98e099e3a01104d2ecf3178363d3b76c8c3619dd
Component: engine
2014-07-10 09:06:58 +00:00
f5fca81a44
Merge pull request #6948 from squarejaw/master
...
Fix typos
Upstream-commit: 1c50f3797c808f2caabb55c719f07281b2a42285
Component: engine
2014-07-10 09:05:48 +00:00
bd2c47615b
Merge pull request #6922 from tianon/bash-complete-build-directories
...
Update bash completion to only complete on directories as the argument to "docker build"
Upstream-commit: 439d7ea701b44724e1e02ff67a220fab7fa9bd1f
Component: engine
2014-07-10 00:26:14 -06:00
323df0e24b
Fix typos
...
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com > (github: squarejaw)
Upstream-commit: 1df4049e17e4a3edf4487b072f2085bc2dd2ee0b
Component: engine
2014-07-09 23:14:06 -05:00
952492cc20
bump api to 1.14 & update docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
2014-07-10 03:24:01 +02:00
61277bebb4
Merge pull request #6942 from jamtur01/addcopy
...
Replaced selected docs references to ADD with COPY
Upstream-commit: 9319b7aef119c83f97dfd028cd557d4cb143d04b
Component: engine
2014-07-09 17:48:31 -07:00
8e5e1a569d
New screenshots and revisions to builds.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: ce9d48e896060d05a78563dce30abfcd5a99c478
Component: engine
2014-07-09 16:43:39 -07:00
f67899e5d8
update for consistency
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b68111713ddab28485122f149055c865ac4dadaa
Component: engine
2014-07-09 21:48:02 +00:00
6401809a76
add check on docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 0abdea90947de867719c622a51f0382bcdf592ee
Component: engine
2014-07-09 21:48:02 +00:00
f134d9e4d0
Add support for IPv6 addresses in --dns parameters.
...
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com > (github: adelton)
Upstream-commit: 899e9e74165b567c157756d56c47d33fac82c05a
Component: engine
2014-07-09 21:48:02 +00:00
42b9849b1f
Merge pull request #6931 from tiborvass/merge-5723
...
Updated docker logs timestamp to RFC3339 (carrying #5723 )
Upstream-commit: 519319b989b7434435d95033f6a7ea9f32d141ec
Component: engine
2014-07-09 14:23:23 -07:00
efd625f4f3
Replaced selected docs references to ADD with COPY
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a1ddf57216e510c5cabe40cac6a00ac57a92b8d7
Component: engine
2014-07-09 17:13:26 -04:00
786f8ce10f
Replace ADD with COPY in Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 457166295c57e982c470110cde653135385cbca5
Component: engine
2014-07-09 17:05:51 -04:00
0ee458dda8
devmapper: revert the default dm-thin-pool blocksize back to 64K
...
Commit 09ee269d ("devmapper: Add option for specifying the thin pool
blocksize") also switched the default dm-thin-pool blocksize from 64K to
512K. That change unfortunately breaks the activation of dm-thin-pool
devices that were previously created using a 64K blocksize. Here is an
example of the dm-thin-pool activation failure users may experience:
device-mapper: thin: 253:4: pool target (204800 blocks) too small: expected 1638400
device-mapper: table: 253:4: thin-pool: preresume failed, error = -22
The reason for this is docker is passing 512K as the blocksize for a
dm-thin-pool that was previously created using a 64K blocksize. Docker
doesn't record the blocksize the is used when it creates a dm-thin-pool.
Until now it never had a need to do so because the blocksize was always
hardcoded. The dm-thin-pool blocksize must be the same every time a
dm-thin-pool is activated.
As a stop-gap fix, revert to using 64K for the default blocksize.
But we do need a proper fix for this now that 'dm.blocksize' is exposed
as a proper storage option. One possible fix would be to record the
blocksize for each dm-thin-pool that docker creates and to pass that
recorded blocksize down in the dmsetup table load each time the
dm-thin-pool is activated (this would be comparable to what lvm2 does).
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com > (github: snitm)
Upstream-commit: d715803d45d41bfbbd5faf1f4a8239c08d6d8c90
Component: engine
2014-07-09 16:47:30 -04:00
b1e80e538c
Merge pull request #6936 from vieux/merge_release_v1.1.1
...
Merge release v1.1.1
Upstream-commit: 31f0cc04ec0585f8fb996edadc8959eeb4e0397c
Component: engine
2014-07-09 13:31:11 -07:00
81a7587cfd
Change version to 1.1.1-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b95fbe2d3fa7ec27a193dc260837f36581ea1771
Component: engine
2014-07-09 19:24:11 +00:00
fc1bf4682a
Merge remote-tracking branch 'origin/release'
...
Conflicts:
VERSION
integration-cli/docker_cli_build_test.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3afb89da48ee7e6e917d852416d434de9e078306
Component: engine
2014-07-09 19:23:53 +00:00
00d5af598a
Merge pull request #6915 from vieux/bump_v1.1.1
...
Bump v1.1.1
Upstream-commit: ecd20a96df134a9d7bcea520c5bfd7ed42beee57
Component: engine
2014-07-09 12:16:22 -07:00
34b700c7bf
Updated docker logs timestamp to RFC3339
...
Currently the docker logs timestamp flag generates log entries like:
$ sudo docker logs -ft daemon_dave
[May 10 13:06:17.934] hello world
It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].
This is non-standard operational timestamp and one that will require
custom parsing.
The new timestamp is RFC3999Nano and generates entries like:
2014-05-10T17:42:14.999999999Z07:00 hello world
These are readily parsed by tools like ELK.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
2014-07-09 11:59:06 -04:00
f673811097
Merge pull request #6926 from LK4D4/log_for_tar_test
...
Simple additions to TestBuildAddTar
Upstream-commit: aec8d904622e1b0f9e5e5be0d54a3328846eedd7
Component: engine
2014-07-09 11:40:55 -04:00
956cad3b32
Merge pull request #6916 from vieux/update_release_checklist_hotfix
...
Add hotfix help to the release checklist
Upstream-commit: 65a5dde38b1584a117762698be863b8af1217d5d
Component: engine
2014-07-09 07:50:38 -06:00
2199b246f3
Simple additions to TestBuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: fc2631b499ba27350f20e7466f54cb06b5c65079
Component: engine
2014-07-09 13:41:57 +04:00
c1ad27879c
Merge pull request #6570 from cpuguy83/add_cpuguy83_as_volumes_maintainer
...
Add cpuguy83 as volumes maintainer
Upstream-commit: 2d34a08c48b734c17a29c0db2c2aae12ff4f8227
Component: engine
2014-07-09 02:12:14 -07:00
2c5c501d5d
Merge pull request #9 from tianon/vieux-hotfix-minor-nits
...
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
Upstream-commit: 463435827bcd762f7e9055298b452403989ed5ed
Component: engine
2014-07-09 00:57:03 -07:00
6971f5c244
Tiny text reformat (as per review comments)
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com > (github: tomfotherby)
Upstream-commit: e479cae7cf86a2929e0439a61565ed7d9100f445
Component: engine
2014-07-09 08:21:31 +01:00
37a093be23
removing an extraneous space
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Upstream-commit: a52441b11417bfbcb8aa57fddae79c4f17d5499a
Component: engine
2014-07-09 14:54:49 +10:00
58d9480aa6
Update bash completion to only complete on directories as the argument to "docker build"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 91769117365207ad3218ee7bea6c472583b3ba2b
Component: engine
2014-07-08 20:26:23 -06:00
710bedaf51
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e1166861d28121b0e389c913de9d0f4faf8f33d8
Component: engine
2014-07-08 19:53:08 -06:00
e17cfef1f0
Merge pull request #6891 from rogaha/update_footer_version
...
Update the footer version with Enterprise and Partners sections
Upstream-commit: 903c2af04e99dbfc4030cc875c470c972895f392
Component: engine
2014-07-09 01:51:22 +00:00
314e2a3728
Bump version to v1.1.1
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: dc62f3cdccfd744c7e1d345da7f167df98cf9686
Component: engine
2014-07-09 00:59:54 +00:00
