0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11571 commits 14 branches 412 tags 338 MiB
Commit graph

11571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessie Frazelle
870a695375 Merge pull request #9011 from vbatts/vbatts-btrfs_information 
btrfs: information for the information gods
 2014-11-13 20:47:07 -08:00
Michael Crosby
967354d488 Merge pull request #9131 from vieux/empty_lines_dockerinfo 
Do not display empty lines in docker info if the key doesn't exists
 2014-11-13 19:08:32 -08:00
Victor Vieux
4f5be9da86 Do not display empty lines in docker info if the key doesn't exists 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-14 02:50:34 +00:00
Michael Crosby
5c863f983d Merge pull request #9107 from ashahab-altiscale/9062-linked-container 
Share network namespace of containers with lxc
 2014-11-13 18:25:38 -08:00
Michael Crosby
039aa2741f Merge pull request #8964 from jlhawn/image_checksum 
Compute TarSum on storage of image layer content
 2014-11-13 18:07:20 -08:00
unclejack
3aa2245914 Merge pull request #8869 from jlhawn/tarsum_version 
Finalize TarSum Version 1 w/ refactor
 2014-11-14 01:12:22 +02:00
Vincent Batts
d7c37b5a28 Dockerfile: buildtags for old btrfs 
Since the build uses ubuntu 14.04, which has an old btrfs, include the
buildtags needed for this old version to not break the build.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-13 16:44:00 -05:00
Vincent Batts
25154682a5 btrfs: build tag to enable showing version info 
be default it is on, with build tags to disable the version info

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-13 16:43:53 -05:00
Jessie Frazelle
b0d219eef0 Merge pull request #9152 from duglin/DockerBuildEnvs 
Allow a few more DOCKER_* env vars to pass thru Makefile
 2014-11-13 12:52:36 -08:00
Jessie Frazelle
06899e0810 Merge pull request #9064 from recursive-madman/patch-1 
Proposed fix for #8979
 2014-11-13 12:24:22 -08:00
Vincent Batts
447a1a9bad Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint 
registry: refactor registry.IsSecure calls into registry.NewEndpoint
 2014-11-13 14:59:26 -05:00
Michael Crosby
b9fb9787b6 Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields 
pkg/mount: adding fields supported by freebsd
 2014-11-13 11:54:16 -08:00
Michael Crosby
e4105e4535 Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree 
pkg/mount: sharedsubtree options and testing
 2014-11-13 11:26:29 -08:00
Doug Davis
912b0f0f73 Allow a few more DOCKER_* env vars to pass thru Makefile 
I was trying to just build the Docker client but DOCKER_CLIENTONLY wasn't
getting passed thru from the shell to the container building docker.

So, this PR passes this var (via the -e option) on the docker run command
so we pick it up from the devs shell when running "make ...".

While in there I pulled all of the "-e" options into a new Makefile variable
so its easy to see just the list of env vars we pass along.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-13 11:25:11 -08:00
Tianon Gravi
70e3cdcdd9 Merge pull request #8644 from tamsky/pull-7698-docfix 
Add mention of e2fsprogs to runtime dependencies.
 2014-11-13 11:07:13 -07:00
Tianon Gravi
abceeb2ef5 Merge pull request #8960 from LK4D4/add_nf_filter_check 
Add check for IP_NF_FILTER
 2014-11-13 11:03:29 -07:00
Alexandr Morozov
8f763a09d3 Merge pull request #9143 from coolljt0725/cleanup_defaulttag 
Cleanup:change "latest" to graph.DEFAULTTAG
 2014-11-13 09:00:00 -08:00
Tibor Vass
fbe10c83d8 registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-13 07:02:24 -08:00
Lei Jitang
3c3968692d Cleanup:change latest to graph.DEFAULTTAG 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-11-13 16:21:34 +08:00
Tibor Vass
78e859f3c3 Put mock registry address in insecureRegistries for unit tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-12 20:34:03 -06:00
Tibor Vass
4455f51760 registry: refactor registry.IsSecure calls into registry.NewEndpoint 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-12 20:34:03 -06:00
Vincent Batts
42861f3b45 Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings 
devicemapper: split out devicemapper bindings
 2014-11-12 19:59:36 -05:00
Michael Crosby
9670871e01 Merge pull request #8982 from rhvgoyal/save-restore-device-id 
Save restore device Id: issue #8978
 2014-11-12 15:41:27 -08:00
Alexandr Morozov
e12572f265 Merge pull request #9031 from cpuguy83/cleanup_api_server_creation 
Cleanup api server creation
 2014-11-12 15:37:34 -08:00
Erik Hollensbe
33382385c3 Merge pull request #9124 from erikh/secure-localhost 
Secure localhost registry (carry of #8898)
 2014-11-12 15:25:15 -08:00
Solomon Hykes
2e27263aac Merge pull request #9127 from vishh/maintainer 
Adding Vish as a maintainer for daemon.
 2014-11-12 15:02:17 -08:00
Vishnu Kannan
06bf79552d Adding Vish as a maintainer for daemon code. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-11-12 22:55:32 +00:00
Michael Crosby
3ef2fc7f0f Merge pull request #9105 from stevenburgess/archiveCommentFix 
Fix comment to match the arg name
 2014-11-12 14:52:27 -08:00
Michael Crosby
08f5edce30 Merge pull request #8479 from vishh/OOM 
Provide Out Of Memory information in container status
 2014-11-12 14:15:29 -08:00
Erik Hollensbe
11380a109e registry: always treat 127.0.0.1 as insecure for all cases anytime anywhere 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-11-12 12:14:43 -08:00
Johan Euphrosine
28ee373e19 registry: default --insecure-registry to localhost and 127.0.0.1 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2014-11-12 09:12:42 -08:00
Vivek Goyal
15c74bebc1 devmapper: Take care of some review comments 
Took care of some review comments from crosbymichael.

v2:
- Return "err = nil" if file deviceset-metadata file does not exist.
- Use json.Decoder() interface for loading deviceset metadata.

v3:
- Reverted back to json marshal interface in loadDeviceSetMetaData().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2014-11-12 09:36:32 -05:00
Jessie Frazelle
6ad1cd5d0f Merge pull request #9102 from brahmaroutu/add_tag_9001 
improve error message to print the tag
 2014-11-12 02:37:40 -07:00
Solomon Hykes
1396cff375 Merge pull request #9079 from SvenDowideit/pr_out_update_roadmap_md_based_on_10_21_2014_dgab_meeting 
Update ROADMAP.md based on 10/21/2014 DGAB meeting
 2014-11-11 23:00:25 -08:00
James Turnbull
492c4fc1a8 Merge pull request #9106 from duglin/TyposRemoteAPI 
Add missing comma in docs
 2014-11-11 22:48:30 -05:00
Doug Davis
814bc06d7b Add missing comma in docs 
Found by Michael Voznesensky <voznesenskym@gmail.com>

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-11 15:18:20 -08:00
Steven Burgess
64a335ceac Fix comment to match the arg name 
Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com>
 2014-11-11 18:01:08 -05:00
unclejack
e546c8cc1d Merge pull request #9041 from unclejack/lxc_maintainers_comment 
execdriver/lxc: add comment to MAINTAINERS
 2014-11-12 00:27:11 +02:00
Srini Brahmaroutu
bc45428220 improve error message to print the tag 
Closes #9001

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-11-11 22:18:40 +00:00
Tibor Vass
e08d1f6af2 Merge pull request #9095 from proppy/is-secure-test 
registry: add tests for IsSecure
 2014-11-11 16:52:36 -05:00
Johan Euphrosine
75e3b35bf1 registry: add tests for IsSecure 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2014-11-11 11:02:32 -08:00
unclejack
c0499494df Merge pull request #9090 from unclejack/archive_interface 
pkg/archive: add interface for Untar
 2014-11-11 20:57:58 +02:00
Fred Lifton
d6a4d045f7 Merge pull request #8840 from decadent/fix-da-copy-directive-reference 
Nuh uh... quoth the build log: Source can't be a URL for COPY
 2014-11-11 10:57:00 -08:00
Fred Lifton
9e0fac3da8 Merge pull request #9082 from SvenDowideit/pr_out_add_some_details_about_the_lifecycle_of_commands_started_with_docker_exec 
Add some details about the lifecycle of commands started with docker exec
 2014-11-11 10:55:12 -08:00
Jessie Frazelle
a131032422 Merge pull request #9091 from duglin/CleanupIntTests 
Cleanup some integration-cli output
 2014-11-11 10:56:29 -07:00
Doug Davis
0cef21cfba Cleanup some integration-cli output 
I noticed a few things that were bugging me in the output
of the integration-cli tests.
- one of the tests used println to stdout so we had garage sent to the screen
- some of the test, in their final log message, didn't include the name of
  the group/file e.g.  daemon - run,iptables   was just   run,iptables

And yes, I noticed this because I'm anal :-)  but also because we should keep
the output of the tests as clean as possible so its easy to spot it when
things go bad.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-11 08:44:32 -08:00
unclejack
14692d0d41 pkg/archive: add interface for Untar 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 18:28:33 +02:00
Tibor Vass
2a517fe103 Merge pull request #8726 from krallin/failed-start-breaks-volumes-from 
Fix: a failed Start() breaks --volumes-from on subsequent Start()'s
 2014-11-11 10:49:33 -05:00
James Turnbull
2ff203f0a6 Merge pull request #9071 from fredlf/add-docs-readme 
Add link to Docs README.
 2014-11-11 07:25:09 -05:00
Abin Shahab
adb07b53e0 LINKED CONTAINER ID PASSED TO LXC 
This passed the --net=container:CONTINER_ID to lxc-start as --share-net
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
 2014-11-11 09:10:15 +00:00