Commit Graph

9452 Commits

Author SHA1 Message Date
Michael Crosby c3f247860a Merge pull request #6979 from LK4D4/fix_race_inspect_start
Use container.Lock in public ToDisk method
2014-07-11 13:44:01 -07:00
LK4D4 eae5cf1e20 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)
2014-07-11 23:31:03 +04:00
James Turnbull 2944d8ca3e Merge pull request #6890 from huslage/tls-doc-fixes2
Clarification of TLS Docs
2014-07-11 14:36:24 -04:00
Aaron Huslage c3d91263a8 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)
2014-07-11 14:35:01 -04:00
James Turnbull 7c4f7780a1 Merge pull request #6209 from zdover23/03_Jun_2014
BZ#1104401 - correcting flags in docker-commit
2014-07-11 08:03:36 -04:00
Victor Vieux 9216ced003 Merge pull request #6961 from crosbymichael/devices-flag
Add --device flag to allow additional host devices in container
2014-07-10 17:44:44 -07:00
Timothy e855c4b921 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)
2014-07-10 10:35:53 -07:00
unclejack 840ed5ace2 Merge pull request #6939 from snitm/thinp-blocksize-fix
devmapper: revert the default dm-thin-pool blocksize back to 64K
2014-07-10 19:57:07 +03:00
unclejack 0c67dcb0df Merge pull request #6920 from vieux/pr_6408
Add support for IPv6 addresses in --dns parameters.
2014-07-10 19:16:23 +03:00
Tibor Vass 85761b7fdb Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile
Replace ADD with COPY in Dockerfile
2014-07-10 10:46:13 -04:00
Sven Dowideit d9265007a0 Merge pull request #6854 from tomfotherby/patch-1
Add documention on how to Mount a Host File as a Data Volume
2014-07-10 10:29:15 +00:00
Sven Dowideit 98e099e3a0 Merge pull request #6945 from fredlf/copyedit-builds
New screenshots and revisions to builds.md
2014-07-10 09:06:58 +00:00
Sven Dowideit 1c50f3797c Merge pull request #6948 from squarejaw/master
Fix typos
2014-07-10 09:05:48 +00:00
Tianon Gravi 439d7ea701 Merge pull request #6922 from tianon/bash-complete-build-directories
Update bash completion to only complete on directories as the argument to "docker build"
2014-07-10 00:26:14 -06:00
Bryan Bess 1df4049e17 Fix typos
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com> (github: squarejaw)
2014-07-09 23:14:06 -05:00
Fred Lifton 9319b7aef1 Merge pull request #6942 from jamtur01/addcopy
Replaced selected docs references to ADD with COPY
2014-07-09 17:48:31 -07:00
Fred Lifton ce9d48e896 New screenshots and revisions to builds.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-09 16:43:39 -07:00
Victor Vieux b68111713d update for consistency
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-09 21:48:02 +00:00
Victor Vieux 0abdea9094 add check on docker run
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-09 21:48:02 +00:00
Jan Pazdziora 899e9e7416 Add support for IPv6 addresses in --dns parameters.
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
2014-07-09 21:48:02 +00:00
Victor Vieux 519319b989 Merge pull request #6931 from tiborvass/merge-5723
Updated docker logs timestamp to RFC3339 (carrying #5723)
2014-07-09 14:23:23 -07:00
James Turnbull a1ddf57216 Replaced selected docs references to ADD with COPY
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-09 17:13:26 -04:00
Tibor Vass 457166295c Replace ADD with COPY in Dockerfile
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-09 17:05:51 -04:00
Mike Snitzer d715803d45 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)
2014-07-09 16:47:30 -04:00
Victor Vieux 31f0cc04ec Merge pull request #6936 from vieux/merge_release_v1.1.1
Merge release v1.1.1
2014-07-09 13:31:11 -07:00
Victor Vieux b95fbe2d3f Change version to 1.1.1-dev
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-09 19:24:11 +00:00
Victor Vieux 3afb89da48 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)
2014-07-09 19:23:53 +00:00
Victor Vieux ecd20a96df Merge pull request #6915 from vieux/bump_v1.1.1
Bump v1.1.1
2014-07-09 12:16:22 -07:00
James Turnbull aa0eca03e6 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)
2014-07-09 11:59:06 -04:00
Tibor Vass aec8d90462 Merge pull request #6926 from LK4D4/log_for_tar_test
Simple additions to TestBuildAddTar
2014-07-09 11:40:55 -04:00
Tianon Gravi 65a5dde38b Merge pull request #6916 from vieux/update_release_checklist_hotfix
Add hotfix help to the release checklist
2014-07-09 07:50:38 -06:00
Alexandr Morozov fc2631b499 Simple additions to TestBuildAddTar
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-09 13:41:57 +04:00
Solomon Hykes 2d34a08c48 Merge pull request #6570 from cpuguy83/add_cpuguy83_as_volumes_maintainer
Add cpuguy83 as volumes maintainer
2014-07-09 02:12:14 -07:00
Victor Vieux 463435827b Merge pull request #9 from tianon/vieux-hotfix-minor-nits
Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
2014-07-09 00:57:03 -07:00
Tom Fotherby e479cae7cf Tiny text reformat (as per review comments)
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-09 08:21:31 +01:00
Zac Dover a52441b114 removing an extraneous space
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
2014-07-09 14:54:49 +10:00
Tianon Gravi 9176911736 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)
2014-07-08 20:26:23 -06:00
Tianon Gravi e1166861d2 Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-08 19:53:08 -06:00
Sven Dowideit 903c2af04e Merge pull request #6891 from rogaha/update_footer_version
Update the footer version with Enterprise and Partners sections
2014-07-09 01:51:22 +00:00
Victor Vieux dc62f3cdcc Bump version to v1.1.1
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-09 00:59:54 +00:00
Michael Crosby f91a97256b Merge pull request #6773 from fabiofalci/restart_tests_to_cli
Move `docker restart` tests to integration cli
2014-07-08 17:44:29 -07:00
James Turnbull 037a869919 Merge pull request #6835 from OddBloke/master
Explain ADD invalidation more accurately
2014-07-08 20:41:59 -04:00
Fred Lifton 4898267988 Merge pull request #6567 from JasonGiedymin/add-h3
Add H3 menu entries for leftnav
2014-07-08 17:38:10 -07:00
Michael Crosby ca9d57245c Merge pull request #6921 from jamtur01/parsego
Fixed some more styling issues with command line flags
2014-07-08 17:34:09 -07:00
James Turnbull 2c9d055253 Merge pull request #6826 from fredlf/copyedit-builds
Copyedit builds
2014-07-08 20:31:04 -04:00
James Turnbull 2112c5e948 Fixed some more styling issues with command line flags
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-08 20:23:12 -04:00
Victor Vieux bdf7224941 Merge pull request #6918 from vieux/rebase_events_leak
Rebase events leak
2014-07-08 17:18:09 -07:00
Michael Crosby a613ac1907 Merge pull request #6270 from kung-foo/5418-underscore
Replace dashes in link name with underscores
2014-07-08 17:09:27 -07:00
Sam Rijs 560eb07009 avoid regression in events test
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
2014-07-09 00:09:03 +00:00
Sam Reis 46747963b6 Add test for event limitation
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
2014-07-09 00:09:03 +00:00