toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,791 Commits 3 Branches 295 Tags
25cbd8f77410eea7726082aec7dc3898bc11cdce
Commit Graph
11791 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 4567691298 Merge pull request #9107 from ashahab-altiscale/9062-linked-container 
Share network namespace of containers with lxc
Upstream-commit: 5c863f983df6ebc913890bd6095cc47d8a3a624b
Component: engine
 2014-11-13 18:25:38 -08:00
Michael Crosby 658637c073 Merge pull request #8964 from jlhawn/image_checksum 
Compute TarSum on storage of image layer content
Upstream-commit: 039aa2741fa95ecb21e35a20d60d72018d8296c9
Component: engine
 2014-11-13 18:07:20 -08:00
unclejack 4189659614 Merge pull request #8869 from jlhawn/tarsum_version 
Finalize TarSum Version 1 w/ refactor
Upstream-commit: 3aa2245914ea73f19838adbb09d0617984fbeb11
Component: engine
 2014-11-14 01:12:22 +02:00
pixelistik 0e182a21a4 Fix typo "infortmation" in docs for docker run 
Upstream-commit: cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Component: engine
 2014-11-13 23:26:49 +01:00
Vincent Batts 5dc5f5a90b 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>
Upstream-commit: d7c37b5a28de6e7c0a9270815c092a45d8d7fef7
Component: engine
 2014-11-13 16:44:00 -05:00
Vincent Batts baecd1f7fb 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>
Upstream-commit: 25154682a5cd57aa4fc3ef88baeee3ce1f204060
Component: engine
 2014-11-13 16:43:53 -05:00
Jessie Frazelle e6274cf281 Merge pull request #9152 from duglin/DockerBuildEnvs 
Allow a few more DOCKER_* env vars to pass thru Makefile
Upstream-commit: b0d219eef0311450306ff5a48ecb0ecee1ce49cc
Component: engine
 2014-11-13 12:52:36 -08:00
Jessie Frazelle aec65b5d89 Merge pull request #9064 from recursive-madman/patch-1 
Proposed fix for #8979
Upstream-commit: 06899e08109b5d1c8e7fa69afed7cc117f9589a9
Component: engine
 2014-11-13 12:24:22 -08:00
Vincent Batts d79900f1e3 Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint 
registry: refactor registry.IsSecure calls into registry.NewEndpoint
Upstream-commit: 447a1a9bad0a9f928e4a30853679255cb02d254f
Component: engine
 2014-11-13 14:59:26 -05:00
Michael Crosby 007506732f Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields 
pkg/mount: adding fields supported by freebsd
Upstream-commit: b9fb9787b6db5332944d9d0f1fc42eae77d34b7d
Component: engine
 2014-11-13 11:54:16 -08:00
Michael Crosby 3b4007ccd1 Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree 
pkg/mount: sharedsubtree options and testing
Upstream-commit: e4105e4535de0ddb1a0e3ddbc646429c5c8ab5ec
Component: engine
 2014-11-13 11:26:29 -08:00
Doug Davis 6e188415a0 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>
Upstream-commit: 912b0f0f73346bf93c4feb32c84c62c18ee62dbc
Component: engine
 2014-11-13 11:25:11 -08:00
Tonis Tiigi e61d8cd073 Fix AUFS silent mount errors on many layers 
Fixes #1171
Fixes #6465

Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous 
implementation checked if error was returned and then started to append layers 
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the 
permission sections or in xino definition the call would not error and 
remaining layers would just be skipped(or some other unknown situation).

This also optimizes system calls as it tries to mount as much as possible with 
the first mount.


Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 6d97339ca23ada27812572016ad4ff9ccffa8b09
Component: engine
 2014-11-13 20:13:13 +02:00
Tianon Gravi 37ee14abc3 Merge pull request #8644 from tamsky/pull-7698-docfix 
Add mention of e2fsprogs to runtime dependencies.
Upstream-commit: 70e3cdcdd9dba29fcbed71c772749655d5907be6
Component: engine
 2014-11-13 11:07:13 -07:00
Tianon Gravi 56d604e1ed Merge pull request #8960 from LK4D4/add_nf_filter_check 
Add check for IP_NF_FILTER
Upstream-commit: abceeb2ef5b3dad2ae0a7ca658f15aef406e8560
Component: engine
 2014-11-13 11:03:29 -07:00
Alexandr Morozov 1a54551b00 Merge pull request #9143 from coolljt0725/cleanup_defaulttag 
Cleanup:change "latest" to graph.DEFAULTTAG
Upstream-commit: 8f763a09d339ae733b833a000fb4f73ce9dd5180
Component: engine
 2014-11-13 09:00:00 -08:00
Sami Wagiaalla 9224549fdb Remove reference to 'ifaceName' from configureBridge comment. 
The argument ifaceName was removed in a much earlier commit.

Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
Upstream-commit: a01f1e707eb682ec60d489a4171d2c82de79ee57
Component: engine
 2014-11-13 10:19:56 -05:00
Tibor Vass 2e493e1f52 registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: fbe10c83d81843412fd3485a8d6bb75849de97d4
Component: engine
 2014-11-13 07:02:24 -08:00
Michal Minar a56997089b Corrected description of --sig-proxy 
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
 2014-11-13 10:50:06 +01:00
Lei Jitang 22cdb1d809 Cleanup:change latest to graph.DEFAULTTAG 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
 2014-11-13 16:21:34 +08:00
Victor Vieux a7280b07fa update timeout 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
 2014-11-13 03:21:18 +00:00
Tibor Vass fdd71c9652 Put mock registry address in insecureRegistries for unit tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 78e859f3c35d1f31e7d6f3ded9a414dc0fbb8eaa
Component: engine
 2014-11-12 20:34:03 -06:00
Tibor Vass 166cb2e350 registry: refactor registry.IsSecure calls into registry.NewEndpoint 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4455f517605f1fd7279bbe9547915f15c037997d
Component: engine
 2014-11-12 20:34:03 -06:00
Vincent Batts 90c31c6725 Merge pull request #8986 from vbatts/vbatts-pkg_devicemapper_bindings 
devicemapper: split out devicemapper bindings
Upstream-commit: 42861f3b45733268da674b82bceb6deef67b5513
Component: engine
 2014-11-12 19:59:36 -05:00
Erik Hollensbe 7feb0036aa Update CONTRIBUTING to reflect new PR-docs process. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 460036cdefb3e452fd5e8d77724d0df55be31da5
Component: engine
 2014-11-12 16:01:25 -08:00
Michael Crosby d82839394f Merge pull request #8982 from rhvgoyal/save-restore-device-id 
Save restore device Id: issue #8978
Upstream-commit: 9670871e0166658c5b6982d3ccf79a82afb9442c
Component: engine
 2014-11-12 15:41:27 -08:00
Alexandr Morozov 4981609d4e Merge pull request #9031 from cpuguy83/cleanup_api_server_creation 
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
 2014-11-12 15:37:34 -08:00
Erik Hollensbe 94f9b5175d Merge pull request #9124 from erikh/secure-localhost 
Secure localhost registry (carry of #8898)
Upstream-commit: 33382385c3f58da82099f5c7fa39dd65cb8c8170
Component: engine
 2014-11-12 15:25:15 -08:00
Solomon Hykes 7635de650e Merge pull request #9127 from vishh/maintainer 
Adding Vish as a maintainer for daemon.
Upstream-commit: 2e27263aac36fa48b3d3dfcd7816bced9e4b00d4
Component: engine
 2014-11-12 15:02:17 -08:00
Vishnu Kannan e5982e367c Adding Vish as a maintainer for daemon code. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 06bf79552d222ef6c4547ae8b0f3cb474a031c76
Component: engine
 2014-11-12 22:55:32 +00:00
Michael Crosby db22845d50 Merge pull request #9105 from stevenburgess/archiveCommentFix 
Fix comment to match the arg name
Upstream-commit: 3ef2fc7f0f025d3e4fc97ccbcc75cbfa667ccb2d
Component: engine
 2014-11-12 14:52:27 -08:00
Michael Crosby a083823cc6 Merge pull request #8479 from vishh/OOM 
Provide Out Of Memory information in container status
Upstream-commit: 08f5edce3092e55f90116fac1b6f634965008f2b
Component: engine
 2014-11-12 14:15:29 -08:00
Erik Hollensbe f8e94225af 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)
Upstream-commit: 11380a109e53bc5f388b6212c12794609c0241eb
Component: engine
 2014-11-12 12:14:43 -08:00
Johan Euphrosine dc8c6e365a registry: default --insecure-registry to localhost and 127.0.0.1 
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 28ee373e19bbfdf47c747f6fd9385a8a75f0a483
Component: engine
 2014-11-12 09:12:42 -08:00
Dan Walsh 09b8238fe6 Allow IPC namespace to be shared between containers or with the host 
Some workloads rely on IPC for communications with other processes.  We
would like to split workloads between two container but still allow them
to communicate though shared IPC.

This patch mimics the --net code to allow --ipc=host to not split off
the IPC Namespace.  ipc=container:CONTAINERID to share ipc between containers

If you share IPC between containers, then you need to make sure SELinux labels
match.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 497fc8876ede9924f61c0eee4dfadd71e5d9f537
Component: engine
 2014-11-12 11:29:58 -05:00
Vivek Goyal 957b4d5684 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>
Upstream-commit: 15c74bebc1ea2d51612b5809b4477551547a8b3d
Component: engine
 2014-11-12 09:36:32 -05:00
Jessie Frazelle e0e5e418c1 Merge pull request #9102 from brahmaroutu/add_tag_9001 
improve error message to print the tag 
Upstream-commit: 6ad1cd5d0f3a27abb3fdb89cc4104328f1b04b49
Component: engine
 2014-11-12 02:37:40 -07:00
Solomon Hykes 88e594e727 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
Upstream-commit: 1396cff37593ea16514573987f48f499c7799959
Component: engine
 2014-11-11 23:00:25 -08:00
James Turnbull 3784297729 Merge pull request #9106 from duglin/TyposRemoteAPI 
Add missing comma in docs
Upstream-commit: 492c4fc1a8027929facaea78697d57283ea3ebfd
Component: engine
 2014-11-11 22:48:30 -05:00
Victor Vieux ad5fd5c082 fix unix socket 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6ca144ef3d62e358327249546bf83ce1e347be5c
Component: engine
 2014-11-12 00:37:58 +00:00
Victor Vieux f37e910c9f handle GET redirects 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
 2014-11-12 00:37:58 +00:00
Doug Davis 97a0952687 Add missing comma in docs 
Found by Michael Voznesensky <voznesenskym@gmail.com>

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

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: bc45428220e4a8d05d9a0cbc701a729f7fe2aa8d
Component: engine
 2014-11-11 22:18:40 +00:00
Tibor Vass a4433b9e0f Merge pull request #9095 from proppy/is-secure-test 
registry: add tests for IsSecure
Upstream-commit: e08d1f6af2de6f0a402bd0e5c26fb5093fda378e
Component: engine
 2014-11-11 16:52:36 -05:00
Johan Euphrosine cc91da7978 registry: add tests for IsSecure 
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 75e3b35bf15dd01363f8b422d6b8a4a62b1054c6
Component: engine
 2014-11-11 11:02:32 -08:00
unclejack 912d74662c Merge pull request #9090 from unclejack/archive_interface 
pkg/archive: add interface for Untar
Upstream-commit: c0499494df9a104f161ff9de93f2c186a3f8cce0
Component: engine
 2014-11-11 20:57:58 +02:00
Fred Lifton 08bbce0a2c 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
Upstream-commit: d6a4d045f7f5eef0f8cbf64bee330aefed6919c1
Component: engine
 2014-11-11 10:57:00 -08:00
Fred Lifton 4cef43d739 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
Upstream-commit: 9e0fac3da8f8e5ba964d3832db8e497d21633f02
Component: engine
 2014-11-11 10:55:12 -08:00