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
a276156a44
Fix expect script in mkimage-arch
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: e72f8161b91e3cdb8a9bc4369ff5f9673a549e2c
Component: engine
2014-07-10 02:09:50 +02:00
b3bd2d5b6c
Revert "removed expect from mkimage-arch since it was not working"
...
This reverts commit 962e1186f9a0a43344e19dcf70bac159f0eafb4e.
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: de5f3020d92f14e7ff544d92440c5bf9e012d460
Component: engine
2014-07-10 01:58:15 +02: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
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
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
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
afb119eb53
Merge pull request #6773 from fabiofalci/restart_tests_to_cli
...
Move `docker restart` tests to integration cli
Upstream-commit: f91a97256b5773f889f9e2d7a1be53f90c3d0318
Component: engine
2014-07-08 17:44:29 -07:00
e3ec85f712
Merge pull request #6835 from OddBloke/master
...
Explain ADD invalidation more accurately
Upstream-commit: 037a869919a686cd18c7a5873842f523ff4b492e
Component: engine
2014-07-08 20:41:59 -04:00
19f873ca05
Merge pull request #6567 from JasonGiedymin/add-h3
...
Add H3 menu entries for leftnav
Upstream-commit: 489826798829f2fd17a36e11e5809b211f808bc6
Component: engine
2014-07-08 17:38:10 -07:00
852cc6a979
Merge pull request #6921 from jamtur01/parsego
...
Fixed some more styling issues with command line flags
Upstream-commit: ca9d57245c0289e90ed70818d7b669e2e8be5050
Component: engine
2014-07-08 17:34:09 -07:00
321e9b819d
Merge pull request #6826 from fredlf/copyedit-builds
...
Copyedit builds
Upstream-commit: 2c9d0552532e2981cd5ca1c5f38ba50c2b286679
Component: engine
2014-07-08 20:31:04 -04:00
bbc512f23b
Fixed some more styling issues with command line flags
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 2112c5e948d1ef3d3efb34875a97f01fde809143
Component: engine
2014-07-08 20:23:12 -04:00
d0b563d37b
Merge pull request #6918 from vieux/rebase_events_leak
...
Rebase events leak
Upstream-commit: bdf72249418ab6dea8921d57e809ca4603be893d
Component: engine
2014-07-08 17:18:09 -07:00
c5b657327a
Merge pull request #6270 from kung-foo/5418-underscore
...
Replace dashes in link name with underscores
Upstream-commit: a613ac19074dcafa54d254c7ce70ec65de9702bc
Component: engine
2014-07-08 17:09:27 -07:00
4eb22040d9
avoid regression in events test
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 560eb07009d65fbcfb49b2fa8b04a2e3f4d647e8
Component: engine
2014-07-09 00:09:03 +00:00
bbaf2a8ed6
Add test for event limitation
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 46747963b603a5573a0b26dcef407a96757926e7
Component: engine
2014-07-09 00:09:03 +00:00
13e7613ad0
Fix server leaking events
...
Solves #6843 .
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
Upstream-commit: 5d4986c755526ad5d249ba96eb6213ce089a9c25
Component: engine
2014-07-09 00:08:36 +00:00
f3b4015ccd
Initial copy edits to builds.md
...
Revised to match new UI, fixed links, copy edits and improvements.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
More revisions to builds.md
Corrections to automated build process, copy edits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Edits based on Sonat's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 27c34f3eb93ee58d585f8b792659dc2c0464bd0d
Component: engine
2014-07-08 17:01:41 -07:00
bfe0fa53e6
Merge pull request #6636 from saaadhu/master
...
Fix typo in README.md
Upstream-commit: f021cd64eda967f7e5a4b3a3f5c99fb7efe49c10
Component: engine
2014-07-08 16:35:26 -07:00
789e6439eb
add hotfix help
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 751c7e0f003e27d7c862ff91ca85f300bfcbf2cc
Component: engine
2014-07-08 23:25:26 +00:00
a8bb2012bc
Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events
...
Add event logs for pause/unpause
Upstream-commit: f0aba1aad4d86c5f4989b40bd27be96d72eab6a2
Component: engine
2014-07-08 15:31:23 -07:00
d2c7dcd66a
Tests for ADD tar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Conflicts:
integration-cli/docker_cli_build_test.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: vieux)
Upstream-commit: 699556e6619ce6806030e87ee1f3ea57bcdefd81
Component: engine
2014-07-08 21:32:18 +00:00
e13c7c8aac
Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets."
...
This reverts commit 1c8d3106df0bd2aba304c7b3863949ca11c2b133.
Conflicts:
archive/archive_test.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: vieux)
Upstream-commit: 94c27842d8d129bdacde98d81e2013ff13143ee8
Component: engine
2014-07-08 21:31:11 +00:00
