clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,961 Commits 9 Branches 112 Tags
ef3192f161a89bbff11d88da523be61484a822f2
Commit Graph
12961 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit de52a1998d Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks 
tell users they can what IP range Hub webhooks can come from so they can...
 2015-01-28 11:55:09 +10:00
Liu Hua 71f8b09543 fix a minor typo in daemon/container.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
 2015-01-28 09:54:40 +08:00
James Turnbull 196cdf1450 Merge pull request #10399 from SvenDowideit/add-registry-mirror-doc 
Add the registry mirror document to the menu
 2015-01-27 20:29:25 -05:00
Sven Dowideit 1d04cc513a Add the registry mirror document to the menu 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-28 10:47:11 +10:00
Michael Crosby b3402f34b2 Merge pull request #10322 from dmcgowan/v2-manifest-tarsum-cache 
V2 manifest tarsum cache
 2015-01-27 16:40:49 -08:00
Alexander Morozov 667dc58c39 Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli 
This needed for our "small" testing daemon using same config as "big"
testing daemon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-27 16:40:11 -08:00
James Turnbull 3ac5596fe0 Merge pull request #10369 from mcfiredrill/etc-host-typo 
fix /etc/host typo in remote API docs
 2015-01-27 18:35:16 -05:00
James Turnbull b2b284b5cd Merge pull request #10373 from chenhanxiao/docker-build-typo 
docs: fix a typo in docker-build man page
 2015-01-27 18:25:55 -05:00
Alexander Morozov e54d162941 Merge pull request #10371 from jlhawn/fix_build_output_10364 
Fix premature close of build output on pull
 2015-01-27 15:09:17 -08:00
Alexander Morozov 8f7cf87fd9 Merge pull request #10383 from cpuguy83/update_m2dman 
Update go-md2man
 2015-01-27 13:59:58 -08:00
Tibor Vass bb4025c4e2 Merge pull request #10230 from tianon/emptyfs 
Update emptyfs support to work properly if scratch is already an image
 2015-01-27 15:01:42 -05:00
Jessie Frazelle b9650ad40b Merge pull request #10249 from jlhawn/distribution_version_header_10247 
Split API Version header when checking for v2
 2015-01-27 11:48:42 -08:00
Michael Crosby c81fb7fa4a Merge pull request #10197 from vbatts/vbatts-dm_cookie_support 
devicemapper: API for cookie support
 2015-01-27 11:44:03 -08:00
Michael Crosby e04cc93a2c Merge pull request #10113 from imreFitos/master 
docs: remove NAT rule when removing bridge
 2015-01-27 11:22:53 -08:00
Michael Crosby 83bec40e86 Merge pull request #10370 from ashahab-altiscale/9875-apparmor-regression 
Fixes apparmor regression
 2015-01-27 10:46:22 -08:00
Derek McGowan ab589b442d Use layer checksum if calculated during manifest creation 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-27 10:21:35 -08:00
Josh Hawn e662775ffb Fix premature close of build output on pull 
The build job will sometimes trigger a pull job when the base image
does not exist. Now that engine jobs properly close their output by default
the pull job would also close the build job's stdout in a cascading close
upon completion of the pull.

This patch corrects this by wrapping the `pull` job's stdout with a
nopCloseWriter which will not close the stdout of the `build` job.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-01-27 10:07:01 -08:00
Brian Goff 79e8ca04f5 Update go-md2man 
Update fixes some rendering issues, including improperly escaping '$' in
blocks, and actual parsing of blockcode.

`ID=$(sudo docker run -d fedora /usr/bin/top -b)` was being converted to
`ID=do docker run -d fedora/usr/bin/top -b)`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-27 09:33:42 -05:00
Sven Dowideit 6774be62d6 tell users they can what IP range Hub webhooks can come from so they can filter 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-27 14:58:29 +10:00
Chen Hanxiao dcfa881a7b docs: fix a typo in docker-build man page 
s/Dockefile/Dockerfile

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-01-27 11:19:02 +08:00
Jessie Frazelle acb8e08296 Merge pull request #10362 from LK4D4/update_libcontainer 
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
 2015-01-26 17:18:00 -08:00
Jessica Frazelle 6a2c6e971d Move one last exec test :) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-26 17:17:08 -08:00
Doug Davis f709da192c Fix docs so WORKDIR mentions it works for COPY and ADD too 
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok.  Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.

Noticed by @phemmer

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-26 17:13:44 -08:00
Tony Miller 87d2adf070 fix /etc/host typo in remote API docs 
Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
 2015-01-27 10:12:54 +09:00
Sven Dowideit a79d363d2d Merge pull request #10344 from SvenDowideit/pr_out_change_to_load_the_json_gz_file 
Change to load the json.gz file
 2015-01-27 11:12:07 +10:00
James Turnbull c48f61cb7a Merge pull request #10343 from unclejack/shrink_sprites-small_360 
docs: shrink sprites-small_360.png
 2015-01-26 19:28:40 -05:00
Sven Dowideit f3fef31277 Merge pull request #10272 from mcfiredrill/document-extrahosts-remote-api 
document the ExtraHosts parameter for /containers/create for the remote ...
 2015-01-27 10:25:00 +10:00
Sven Dowideit 60089ace48 as we're not using the search suggestion feature only load the search_content when we have a search ?q= param 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2015-01-27 09:57:45 +10:00
Sven Dowideit 64f67af2b2 set the content-type for the search_content.json.gz 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2015-01-27 09:57:44 +10:00
Sven Dowideit a78130467a Change to load the json.gz file 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2015-01-27 09:57:44 +10:00
unclejack 1e41d57bd4 docs: compress search_content.json for release 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

Docker-DCO-1.1-Signed-off-by: unclejack <unclejacksons@gmail.com> (github: SvenDowideit)
 2015-01-27 09:57:43 +10:00
Michael Crosby 70ea474de9 Merge pull request #10361 from dmcgowan/v2-registry-errors 
Better error messaging and logging for v2 registry requests
 2015-01-26 15:38:22 -08:00
Michael Crosby 3466baafc1 Merge pull request #10261 from cpuguy83/fix_volume_err_on_symlink_eval 
Do not return err on symlink eval
 2015-01-26 15:12:46 -08:00
Michael Crosby e15300b251 Merge pull request #10360 from dmcgowan/keyfile-error-message 
Add file path to errors loading the key file
 2015-01-26 14:44:07 -08:00
Arnaud Porterie bfa0dc47da Merge pull request #10305 from jlhawn/use_tarsum_v1 
Always store images with tarsum.v1 checksum added
 2015-01-26 14:42:07 -08:00
Derek McGowan d277714614 Better error messaging and logging for v2 registry requests 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-26 14:00:51 -08:00
Alexander Morozov fd2d45d7d4 Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c 
This revision is from docker_1.5 branch, because we don't want to
introduce user namespace in docker 1.5, but fix for --pid=host is
needed.

Fixes #10303

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-26 14:00:44 -08:00
Michael Crosby db6ecffc69 Merge pull request #10327 from dmcgowan/progress-reader-fix 
Revert progressreader to not defer close
 2015-01-26 13:07:12 -08:00
Michael Crosby 1c9e16f00f Merge pull request #10359 from crosbymichael/stats-json 
Remove omitempty json tags from stucts
 2015-01-26 13:06:47 -08:00
Derek McGowan a90e91b500 Add file path to errors loading the key file 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-26 12:58:45 -08:00
Brian Goff b54305ae23 Do not return err on symlink eval 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-26 15:22:32 -05:00
Michael Crosby 949f2ca8cb Merge pull request #10323 from dmcgowan/path-v-filepath-fix 
Use filepath instead of path
 2015-01-26 11:56:14 -08:00
Arnaud Porterie 74014e4a92 Merge pull request #10335 from euank/EmptyLayerConfig 
Allow empty layer configs in manifests
 2015-01-26 11:53:36 -08:00
Michael Crosby ed8e89c54d Merge pull request #10309 from cpuguy83/fix_bind_vol_partially_removed 
Fix bind-mounts only partially removed
 2015-01-26 11:53:08 -08:00
Jessie Frazelle 8b031eb892 Merge pull request #10331 from DiuDiugirl/master 
Fix a minor typo
 2015-01-26 11:52:18 -08:00
Michael Crosby 364c64cf1a Merge pull request #10295 from ashahab-altiscale/9875-lxc-exit-code 
Adds ipc namespace capability to lxc, and fixes tests.
 2015-01-26 11:21:48 -08:00
Jessica Frazelle b3dfe1a63a Add completion for stats. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-26 11:19:29 -08:00
Michael Crosby 44f4c95c0e Remove omitempty json tags from stucts 
When unmarshaling the json response from the API in languages to a
dynamic object having the omitempty field tag on types such as float64
case the key to be omitted on 0.0 values.  Various langages will
interpret this as a null when 0.0 is the actual value.

This patch removes the omitempty tags on fields that are not structs
where they can be safely omited.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-26 11:16:29 -08:00
Michael Crosby a3c5223b2a Merge pull request #10194 from jfrazelle/lxc-test-fixes 
ignore exec tests when passing DOCKER_EXECDRIVER lxc
 2015-01-26 11:07:52 -08:00
Brian Goff b4283209d5 Fix bind-mounts only partially removed 
When calling delete on a bind-mount volume, the config file was bing
removed, but it was not actually being removed from the volume index.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-26 12:38:20 -05:00