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,979 Commits 9 Branches 112 Tags
fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Commit Graph
40 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hooper e37ce11cfa Merge pull request #227 from chooper/issue226_vagrant 
Remove /usr/local/bin/docker from Vagrant VirtualMachine image during provisioning
 2013-03-27 22:56:37 -07:00
Charles Hooper fa89076673 Remove /usr/local/bin/docker 2013-03-28 05:28:11 +00:00
Charles Hooper 5aba56e0e0 Merge remote-tracking branch 'upstream/master' 2013-03-28 02:08:04 +00:00
Charles Hooper daa7e4a203 Merge pull request #184 from titanous/simplify-vagrant 
vagrant: Simplify provisioning to build from repo
 2013-03-27 19:07:20 -07:00
Charles Hooper 95d87f1ac0 Merge remote-tracking branch 'upstream/master' 2013-03-27 14:50:42 +00:00
Charles Hooper 7e9975d00a Merge pull request #205 from crazysim/docker-local-shared 
Use the directory where the Vagrantfile is located for SyncFolders instead of a hard-coded "~/docker"
 2013-03-27 07:34:58 -07:00
Charles Hooper 6b54a439b2 Merge pull request #204 from dhrp/master 
Added amazon install path to documentation.
 2013-03-26 20:23:21 -07:00
Charles Hooper 00b81936aa Merge pull request #192 from chooper/vagrant11-providers 
Fix AWS provisioning with Vagrant
 2013-03-26 20:18:09 -07:00
Charles Hooper 9e5a25c100 Merge remote-tracking branch 'upstream/master' 2013-03-27 02:19:52 +00:00
Charles Hooper 8461196a79 Stop using custom AMI and use standard Ubuntu AMI 2013-03-27 01:41:47 +00:00
Charles Hooper 5bec4b8f04 Fix Rackspace cloud user, remove dupe /home/vagrant definition 2013-03-27 01:41:06 +00:00
Charles Hooper 2b7284db4f Remove duplicate user definition 2013-03-27 01:20:45 +00:00
Charles Hooper 2b090320be Merge remote-tracking branch 'upstream/master' into vagrant11-providers 
Conflicts:
	puppet/modules/docker/manifests/init.pp
 2013-03-27 01:09:22 +00:00
Charles Hooper 195208593d Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	README.md
 2013-03-26 22:30:49 +00:00
Charles Hooper afdf29e57f Fix issue where Vagrant AWS deploys outside of my dev account would fail 2013-03-26 21:21:54 +00:00
Charles Hooper 5cebc226cc Use new AMI that won't cause issues with cloud-init apply_creds 2013-03-26 17:40:56 +00:00
Charles Hooper 4c19c9341c Merge remote-tracking branch 'upstream/master' 2013-03-25 19:41:24 +00:00
Charles Hooper fcdfd696ec Merge remote-tracking branch 'upstream/master' 2013-03-25 18:24:45 +00:00
Charles Hooper 94b9ca988d Fix missing group "Vagrant" error 2013-03-24 10:49:16 +00:00
Charles Hooper bea7894166 Merge remote-tracking branch 'amesserl/raxcloud-support' 
Conflicts:
	Vagrantfile
 2013-03-24 10:16:50 +00:00
Charles Hooper 7cc0a07524 Fix *other* typo in README 2013-03-15 04:29:10 +00:00
Charles Hooper 98a4d38eb4 Fix typo in README 2013-03-15 04:26:59 +00:00
Charles Hooper 8c83484bf2 Add AWS support for running Docker on AWS 2013-03-15 04:22:07 +00:00
Charles Hooper 2b8c79d74c Merge remote-tracking branch 'upstream/master' 2013-03-14 01:49:46 +00:00
Charles Hooper 06553a756b Create docker directories *before* allocating a LayerStore 2013-03-14 01:48:50 +00:00
Charles Hooper 3686feaccc Minor formatting changes to ProgressReader. Newlines when complete 2013-03-14 01:37:47 +00:00
Charles Hooper 8c2ff9374c Merge branch 'master' into pull-missing 2013-03-13 19:51:08 +00:00
Charles Hooper fae8284b16 Merge branch 'master' into pull-missing 
Conflicts:
	image/image.go
	server/server.go
 2013-03-13 18:33:48 +00:00
Charles Hooper b0265e0a38 Remove Curl function from future 2013-03-12 23:06:07 +00:00
Charles Hooper b5c1cd7991 Only update download/untar progress every 1%. Related to #49 2013-03-12 23:02:50 +00:00
Charles Hooper 2feefb4375 Fix "no such image" bug in docker run, introduced last commit. Ref #49,#50 2013-03-12 22:13:21 +00:00
Charles Hooper 1bfd827701 Add native Go downloading functionality with progress bar. Ref #49, #50 2013-03-12 22:08:10 +00:00
Charles Hooper 49554f47f6 Add Download method for native Go downloading (to replace curl). Catch 404s. 
Ref: #49, #50
 2013-03-12 20:50:11 +00:00
Charles Hooper 8e0986caec Error gracefully when an image is not found on pull. Addresses #50 and comments from #49 2013-03-12 05:49:57 +00:00
Charles Hooper b8219b5275 Don't allow images with colons in name and reject pegging versions on pull/import. Addresses #49 and #52 2013-03-12 04:31:49 +00:00
Charles Hooper 63edf8a4a1 Use ioutil.NopCloser instead of opening /dev/null for ReadCloser in CmdRun. Related to #31 2013-03-12 03:18:34 +00:00
Charles Hooper f6d64738d0 Pull missing images on run. Addresses #31. 
chooper@chimay:~/projects/docker/bin$ ./docker images
	NAME                ID                  CREATED             PARENT
	chooper@chimay:~/projects/docker/bin$ ./docker run -a base echo "hello world"
	Downloading from http://s3.amazonaws.com/docker.io/images/base
	Unpacking to base
	######################################################################## 100.0%
	base:e9cb4ad9173245ac
	hello world
	chooper@chimay:~/projects/docker/bin$ ./docker run -a base echo "hello world"
	hello world
	chooper@chimay:~/projects/docker/bin$ ./docker run -a nosuchimage echo "hello world"
	Downloading from http://s3.amazonaws.com/docker.io/images/nosuchimage
	Unpacking to nosuchimage
	######################################################################## 100.0%
	Error: Error downloading image: nosuchimage
	chooper@chimay:~/projects/docker/bin$
 2013-03-12 02:58:39 +00:00
Charles Hooper 52b811f50a Add all commands to the output of 'dotcloud help'. Fixes #39 2013-03-11 23:11:46 +00:00
Charles Hooper a7cb3cb86a Complete fix for #38 -- fix double-usage on help 2013-03-11 22:29:13 +00:00
Charles Hooper 06d420d2ea Fix CmdInspect and CmdImages help/parsing. Fixes #38 2013-03-11 22:08:22 +00:00