clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,990 Commits 9 Branches 112 Tags
5ea8dc376c94de6939e35a4152b1a9a5979911dd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle 505788deb2 Merge pull request #10422 from cpuguy83/cleanup_daemon_volumes 
Cleanup daemon/volumes
 2015-04-22 17:13:47 -07:00
Jessie Frazelle 1d48cccc99 Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp 
Make `docker cp` bind-mount volumes
 2015-04-22 15:59:28 -07:00
Jessie Frazelle 3c9ae03a86 Merge pull request #12650 from LK4D4/carry_12472 
remove execCreate & execStart from job
 2015-04-22 15:32:14 -07:00
Jessica Frazelle 7a525c6cb7 add integration test for error pull nonexistent 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-22 14:11:25 -07:00
Jessie Frazelle e3e1c2be42 Merge pull request #12376 from Mic92/refactor-hack 
Refactor shellscripts
 2015-04-22 12:12:44 -07:00
Jessie Frazelle fd3b722928 Merge pull request #12634 from PeterDaveHello/patch-2 
Use svg instead of png to get better image quality
 2015-04-22 10:53:47 -07:00
Jessie Frazelle 17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle 47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Jessie Frazelle 82f75df9e9 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
 2015-04-20 17:27:17 -07:00
Jessie Frazelle 874d64e690 Merge pull request #12517 from mavenugo/master 
Enhanced port integration-cli tests
 2015-04-20 17:26:48 -07:00
Jessie Frazelle 4bb8924b52 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
 2015-04-20 17:26:09 -07:00
Jessie Frazelle 4a25c5d25b Merge pull request #12533 from ankushagarwal/gofmt-directory 
gofmt 1.4.2  src directory
 2015-04-20 17:02:43 -07:00
Jessie Frazelle e1fd7e25de Merge pull request #12566 from fntlnz/remove-go1.3.3-support 
Removed go1.3.3 support
 2015-04-20 17:01:57 -07:00
Jessie Frazelle df217120cd Merge pull request #12471 from coolljt0725/fix_weird_output_format 
Fix weird terminal output format
 2015-04-20 17:01:02 -07:00
Jessie Frazelle fcacb1793e Merge pull request #12568 from duglin/TweakConfigPerms 
Make .docker dir have 0700 perms not 0600
 2015-04-20 16:33:10 -07:00
Jessie Frazelle 23ec4cab60 Merge pull request #12556 from icecrime/update_release_checklist 
Update release checklist
 2015-04-20 16:31:40 -07:00
Jessie Frazelle d5dc565432 Merge pull request #12416 from ya7ya/patch-1 
adding elementary OS to install script
 2015-04-20 14:50:16 -07:00
Jessica Frazelle e79c77fb8d bump version to 1.6.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-16 12:56:02 -07:00
Jessica Frazelle 99d0413033 Bump version to v1.6.0 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

(cherry picked from commit 47496519da)
 2015-04-16 12:45:02 -07:00
Jessie Frazelle dfa5feab2f Merge pull request #12451 from moxiegirl/release-versions-set 
doc fixes for 1.6
 2015-04-16 11:35:46 -07:00
Jessie Frazelle 1899b2f41a Merge pull request #12423 from crosbymichael/idkbutitworks 
Ensure state is destroyed on daemont restart
 2015-04-15 21:19:38 -07:00
Jessie Frazelle 2e4d36ed80 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
 2015-04-15 14:47:12 -07:00
Jessie Frazelle ec4b0b1e27 Merge pull request #12382 from jfrazelle/modprobe-all-the-things-modules-for-the-modules-god 
try to modprobe bridge
 2015-04-15 08:45:00 -07:00
Jessica Frazelle b3867b8899 try to modprobe bridge 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-15 07:19:37 -07:00
Jessie Frazelle 485071f92e Merge pull request #11945 from lmars/fix-upstart-post-start 
Prevent Upstart post-start stanza from hanging
 2015-04-14 16:23:04 -07:00
Jessie Frazelle 74f4a88305 Merge pull request #11999 from vbatts/vbatts-decide_storage 
graphdriver: prefer prior driver state
 2015-04-14 13:04:21 -07:00
Jessica Frazelle 736824ccc1 change go tools to use certain commit 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-14 09:32:23 -07:00
Jessie Frazelle f68ad63496 Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem 
Add detection for F2Fs and JFS
 2015-04-13 17:32:47 -07:00
Jessie Frazelle 24df333fa5 Merge pull request #12349 from calavera/patch-1 
Fix JSON format in the remote api configuration examples.
 2015-04-13 16:59:12 -07:00
Jessica Frazelle 9a87553e4f cleanup test wrong key.json leading to other failures 
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 16:58:44 -07:00
Jessica Frazelle f3ba0a6a35 change tabs to spaces 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 12:48:40 -07:00
Jessie Frazelle 85f1410a5a Merge pull request #12049 from tianon/bundles-latest 
Add "bundles/latest" symlink
 2015-04-13 11:11:38 -07:00
Jessie Frazelle d90da05b1b Merge pull request #12283 from brendandixon/win-cli/wrapfix 
Turned off Ctrl+C processing by Windows shell
 2015-04-10 16:40:43 -07:00
Jessie Frazelle c77ac8e29d Merge pull request #12225 from chenhanxiao/commit-accent 
docs: add missing accent mark around docker command
 2015-04-09 11:34:07 -07:00
Jessie Frazelle 2b96bd0bb8 Merge pull request #11895 from liusdu/m 
show the right image name in job log and docker ps
 2015-04-09 10:21:07 -07:00
Jessica Frazelle 255b84444a cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-08 16:59:36 -07:00
Jessie Frazelle d08db9a059 Merge pull request #12160 from mrunalp/remove_unused 
Removes unused function.
 2015-04-07 16:05:49 -07:00
Jessie Frazelle ebd7df3bbe Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon 
Refactor utils/utils_daemon
 2015-04-07 13:24:24 -07:00
Jessie Frazelle 9ede3f9fc1 Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix 
Swap width/height in GetWinsize and monitorTtySize
 2015-04-06 16:54:29 -07:00
Jessie Frazelle 37a16580b1 Merge pull request #12064 from brendandixon/win-cli/rawfix 
Windows console fixes
 2015-04-06 18:45:08 +00:00
Jessie Frazelle b2fbd9e632 Merge pull request #12060 from duglin/RemoveTable3 
Remove engine.Table from docker search and fix missing field
 2015-04-03 21:29:36 +00:00
Jessie Frazelle 9cdad8a26b Merge pull request #11886 from jamiehannaford/pkg-mnt-docs 
Document exported functions and consts in pkg/mount
 2015-04-03 21:28:11 +00:00
Jessie Frazelle 4d571257ed Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
 2015-04-03 20:39:21 +00:00
Jessie Frazelle 409ed98c3f Merge pull request #12048 from tianon/auto-btrfs_noversion 
Change the btrfs_noversion check to be automatic
 2015-04-03 19:00:57 +00:00
Jessie Frazelle 3985dc299a Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
 2015-04-03 18:58:52 +00:00
Jessie Frazelle 3683498d6f Merge pull request #12037 from twhiteman/master 
integration-cli: in TestPsListContainersSize, check for no containers
 2015-04-03 18:52:26 +00:00
Jessie Frazelle 55da2e5987 Merge pull request #12059 from whoshuu/readme 
Clean up formatting in the README
 2015-04-03 18:49:26 +00:00
Jessie Frazelle b3e9c274dd Merge pull request #11981 from unclejack/fix_profiler 
api/server: fix profiler HTTP serving
 2015-04-03 18:25:12 +00:00
Jessie Frazelle 962ded2dee Merge pull request #12036 from crosbymichael/update-libcontainer-apr2 
Update libcontainaer to d00b8369852285d6a830a8d3b9
 2015-04-02 14:46:44 -07:00
Jessica Frazelle c447fd339a TestVolumesFromHasPriority fix race 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-04-01 18:06:28 -07:00
Jessica Frazelle f472c7236f fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container... 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-04-01 17:47:36 -07:00
Jessica Frazelle 664004ed0c Mounting a directory of devices like /dev/snd should mount all child devices. 
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-01 15:57:41 -07:00
Jessie Frazelle 596ddef7d7 Merge pull request #11967 from LK4D4/fix_panic 
Avoid ServeApi race condition
 2015-03-31 16:37:32 -07:00
Jessie Frazelle 749a117267 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
 2015-03-31 13:56:23 -07:00
Jessie Frazelle a381a1bb03 Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test 
Added basic integration tests for docker wait command
 2015-03-31 13:23:23 -07:00
Jessie Frazelle b875e126dd Merge pull request #11137 from rhvgoyal/fix-removal 
Do not remove container if underlying resource cleanup failed
 2015-03-31 13:09:23 -07:00
Jessie Frazelle e7c48f5817 Merge pull request #11942 from crosbymichael/update-libct-mar30 
Update libcontainer to c8512754166539461fd860451ff
 2015-03-30 17:12:53 -07:00
Jessie Frazelle f0ddbbaa86 Merge pull request #11933 from LK4D4/fix_err_mask 
Various fixes for execdriver
 2015-03-30 17:12:35 -07:00
Jessie Frazelle 1ce39e234c Merge pull request #11904 from albers/completion-filters 
Add missing filters to bash completion for docker images and docker ps
 2015-03-30 16:37:01 -07:00
Jessica Frazelle 4a2ef6c805 fix basicAuth function not in go1.3.3 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-03-30 15:28:34 -07:00
Jessie Frazelle f3a048516e Merge pull request #11901 from albers/dockerfile-bash-completion 
Enable bash completion in build environment
 2015-03-30 11:52:43 -07:00
Jessie Frazelle e3b0014987 Merge pull request #11708 from coolljt0725/add_cgroup_parent_to_bash_completion 
Add new docker run option to bash completion
 2015-03-27 15:06:10 -07:00
Jessie Frazelle 221ff368df Merge pull request #11852 from clnperez/doc-dev-container 
Fix typo in doc at /set-up-dev-env
 2015-03-27 15:03:36 -07:00
Jessie Frazelle 121de9e4e3 Merge pull request #11850 from kytrinyx/11796-git-mental-model 
Clarify git instructions in project guide. Fixes #11796
 2015-03-27 09:02:03 -07:00
Jessie Frazelle cf7104a0e8 Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix 
term/winconsole: Identify tty correctly, fix resize problem
 2015-03-26 16:19:27 -07:00
John Willis 2c07fd9fdf #11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md 
Signed-off-by: John Willis <john.willis@docker.com>
 2015-03-26 16:09:56 -04:00
Jessie Frazelle df90fb716b Merge pull request #10050 from lindenlab/9922-private-registry-search-401 
9922-fix: private registry search with auth returns 401
 2015-03-26 12:24:06 -07:00
Jessie Frazelle 667452ec63 Merge pull request #11779 from blatyo/add_ulimit_test 
Add test for successful Ulimit Parse.
 2015-03-25 17:34:58 -07:00
Jessie Frazelle 89e7f5e661 Merge pull request #11772 from aneshas/11718-redundant-else 
Fixed redundant else
 2015-03-25 16:16:16 -07:00
Jessie Frazelle f14bf9b53c Merge pull request #11773 from icecrime/unused_securityopt_field 
Remove unused runconfig.Config.SecurityOpt field
 2015-03-25 16:15:41 -07:00
Jessie Frazelle 8cd3564ec1 Merge pull request #11771 from aneshas/11719-redundant-elses 
Removed redundant elses
 2015-03-25 16:06:30 -07:00
Jessie Frazelle 667df336b7 Merge pull request #11756 from vbatts/vbatts-remove_trailing_whitespaces 
.: remove trailing white spaces
 2015-03-25 11:36:10 -07:00
Jessie Frazelle e6e2893fa3 Merge pull request #11753 from vbatts/vbatts-btrfs_ifdef_build_version 
btrfs: #ifdef for build version
 2015-03-25 11:25:49 -07:00
Jessica Frazelle c959d26d2f fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:16 -07:00
Jessica Frazelle 7dce902494 Get rid of panic in stats for lxc 
Fix containers dir

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:06 -07:00
Jessie Frazelle 22dba32b4d Merge pull request #10527 from mfojtik/lxc_11 
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
 2015-03-24 17:37:27 -07:00
Jessie Frazelle aecc5b606f Merge pull request #11728 from crosbymichael/lxc-mkdir 
Mkdir for lxc root dir before setup of symlink
 2015-03-24 16:25:12 -07:00
John Willis 3d28fc7d1c #11465 Add additional doc for locagi registries onn pull command 
Signed-off-by: John Willis <john.willis@docker.com>
 2015-03-23 21:00:02 -04:00
Jessie Frazelle e6b7d93072 Merge pull request #11665 from runcom/11613-api-exec-start-structured-response 
Return ContainerExecCreateResponse from container exec create API endpoint
 2015-03-23 17:52:15 -07:00
Jessie Frazelle 26f84d50aa Merge pull request #11674 from jamshid/docfix 
correcting git fetch command
 2015-03-23 17:11:31 -07:00
Jessie Frazelle d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Jessie Frazelle f99da5745c Merge pull request #11672 from nparker94/master 
Added missing code example in the RM command reference
 2015-03-23 16:53:39 -07:00
Jessie Frazelle bcb369af11 Merge pull request #11469 from albers/completion-cp 
restrict bash completion for hostdir arg to directories
 2015-03-23 15:31:00 -07:00
Jessie Frazelle 9d00d8137f Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes 
pkg/archive: ignore mtime changes on directories
 2015-03-23 15:24:05 -07:00
Jessie Frazelle ccd4181d10 Merge pull request #11545 from cpuguy83/remove_allocator_warning 
Don't warn when ip_local_port_range not found
 2015-03-23 14:19:57 -07:00
Jessie Frazelle b094677559 Merge pull request #11648 from ahmetalpbalkan/win-cli/ansi-emulation-check 
Disable ANSI emulation in certain windows shells
 2015-03-23 12:55:31 -07:00
Jessie Frazelle 85ab3c3b49 Merge pull request #11573 from icecrime/11572-restore_pull_test 
Restore TestPullVerified test
 2015-03-23 11:21:16 -07:00
Jessie Frazelle 1fe55b2f8b Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind 
Allow path from normal volume existing to overwrite in start Binds
 2015-03-23 10:43:02 -07:00
Jessie Frazelle c4603de56a Merge pull request #10347 from unclejack/bufreader_reset 
reset bufReader to avoid extreme growth of buffers
 2015-03-23 10:07:43 -07:00
Jessie Frazelle 56acb1aac8 Merge pull request #11395 from mitchcapper/master 
Change windows default permissions to 755 not 711, read access for all p...
 2015-03-23 09:59:40 -07:00
Jessie Frazelle bf304cc414 Merge pull request #11574 from icecrime/release_version_push 
Document VERSION file update scheme
 2015-03-23 09:47:16 -07:00
Jessie Frazelle 45ee402a63 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
 2015-03-22 19:16:23 -07:00
Jessie Frazelle 01506d13fa Merge pull request #11553 from Sirupsen/update-logrus-71 
vendor: update logrus to 0.7.1
 2015-03-22 18:11:17 -07:00
Jessie Frazelle e40fc2f038 Merge pull request #11546 from moxiegirl/bday-edits-before 
Update contributor docs and triage to match new labeling system
 2015-03-21 16:25:10 -07:00
Jessie Frazelle b6e20a67f9 Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
 2015-03-21 15:23:25 -07:00
Jessie Frazelle 57f061211a Merge pull request #11530 from twhiteman/master 
docs: cli: reorder rename command to be in alphabetical order
 2015-03-20 15:59:44 -07:00
Jessie Frazelle 41f2b010c6 Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets 
cleanup unix sockets
 2015-03-20 14:55:17 -07:00
Jessie Frazelle 24a148d384 Merge pull request #11457 from jlhawn/pull_by_digest_verify 
Add verification of image manifest digests on v2 push/pull
 2015-03-20 10:49:16 -07:00
Jessie Frazelle ba6de9121f Merge pull request #11408 from Mashimiao/fix-wrong-tab-completion 
fix wrong tab completion
 2015-03-20 10:46:26 -07:00
Jessie Frazelle 0dca963f40 Merge pull request #11522 from duglin/FixCGroupTests 
Ignore blank lines in getCgroupPaths
 2015-03-20 10:44:57 -07:00