docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
128 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

128 Commits

Author SHA1 Message Date
Evan Hazlett e793b1cef0 Merge pull request #177 from nathanleclaire/readme_console 
Add console highlighting to README
 2014-12-30 15:12:27 -05:00
Nathan LeClaire 37d358810e Add console highlighting to README 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-30 10:52:37 -08:00
Ben Firshman a5e55ff007 Merge pull request #176 from ehazlett/fix-cache-b2d-url 
update b2d iso url
 2014-12-30 17:54:19 +00:00
Evan Hazlett cd7d47074c
update b2d iso url 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-30 12:52:11 -05:00
Evan Hazlett b61dfd3416 Merge pull request #175 from bfirsh/remove-me-from-readme 
Remove me from readme
 2014-12-30 10:18:49 -05:00
Ben Firshman ba213b9042 Merge pull request #111 from ehazlett/persist-b2d-keys 
fixes #108: persist identity keys in b2d
 2014-12-30 14:35:03 +00:00
Ben Firshman 0724b4620f Remove me from readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-30 11:16:00 +00:00
Evan Hazlett a3441eb0e1 Merge pull request #131 from sthulb/configure-path 
Configurable storage path
 2014-12-29 16:57:43 -05:00
Simon Thulbourn 003c0dd093 Configurable storage path 
As per #77, this PR adds --storage-path/MACHINE_STORAGE_PATH (env var)
to allow the user to specify where they want to store the machine db

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-26 19:57:48 +00:00
Ben Firshman 82965024ea Merge pull request #105 from nathanleclaire/cache_b2d_iso 
Only download boot2docker.iso one time
 2014-12-22 22:15:27 +00:00
Evan Hazlett b86c37a215 Merge pull request #127 from bfirsh/roadmap 
Add roadmap
 2014-12-22 16:52:48 -05:00
Ben Firshman dcf6c78011 Add roadmap 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-22 21:47:20 +00:00
Evan Hazlett 5a070bd16a Merge pull request #110 from ehazlett/ec2-env-vars 
add env vars for amazonec2 driver
 2014-12-22 13:03:22 -05:00
Evan Hazlett 62edc911fe Merge pull request #126 from nathanleclaire/readme 
Add instructions about build script to README
 2014-12-19 16:44:58 -05:00
Nathan LeClaire 74d1b73083 Add instructions about build script to README 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-19 11:51:34 -08:00
Evan Hazlett 74328e113a add env vars for amazonec2 driver 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-19 10:25:03 -05:00
Evan Hazlett b2f2b912e6 Merge pull request #98 from ehazlett/ec2-use-vpc 
add vpc-id and zone options for ec2
 2014-12-19 10:21:35 -05:00
Evan Hazlett 319a73452c Merge pull request #84 from bfirsh/rename-hosts-directory-to-machines 
Rename ~/.docker/hosts to ~/.docker/machines
 2014-12-18 14:06:12 -05:00
Ben Firshman eabb103f8b Merge pull request #113 from ehazlett/ec2-fixes 
add standard upgrade procedure; spelling
 2014-12-18 01:50:49 +00:00
Ben Firshman 2d72ba832c Merge pull request #120 from bfirsh/add-ehazlett-as-a-maintainer 
Add @ehazlett as a maintainer
 2014-12-18 01:00:06 +00:00
Ben Firshman eb8c525926 Add @ehazlett as a maintainer 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-17 16:57:09 -08:00
Ben Firshman faef4fc853 Merge pull request #112 from nathanleclaire/go_vet 
Fix a few things caught by go vet
 2014-12-17 21:57:36 +00:00
Evan Hazlett e49e368cc3
allow vpc-id, zone and subnet-id options for ec2 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-17 16:31:00 -05:00
Evan Hazlett bce80946d1
just return sshCmd.Run 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-17 13:43:31 -05:00
Ben Firshman d16614757e Merge pull request #116 from nathanleclaire/fix_script_bash 
Fix scripting issue (systems which don't default to bash)
 2014-12-17 18:36:03 +00:00
Nathan LeClaire 2f44eca0d3 Fix scripting issue (systems which don't default to bash) 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-17 10:11:43 -08:00
Ben Firshman c27e65fe66 Merge pull request #114 from bfirsh/travis-docker 
Run Travis build on Docker
 2014-12-17 17:16:17 +00:00
Ben Firshman fc56c06eba Run Travis build on Docker 
Yay!

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-17 09:13:06 -08:00
Evan Hazlett 13afcfe3ed
add standard upgrade procedure; spelling 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-16 22:35:07 -05:00
Nathan LeClaire 154d71ee9c Make more robust based on feedback from @ehazlett 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-16 16:24:48 -08:00
Evan Hazlett 02c38dcda7 fixes #108: persist identity keys in b2d 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-16 19:20:52 -05:00
Nathan LeClaire fb0407ecdc Only download boot2docker.iso one time 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-16 15:30:57 -08:00
Nathan LeClaire 6c889c3864 Fix a few things caught by go vet 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-16 14:21:44 -08:00
Evan Hazlett 3d1582c69f
add default zone for amazonec2 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-16 14:37:23 -05:00
Ben Firshman 808bde5b14 Merge pull request #107 from nathanleclaire/dockerignore 
A few additions to .dockerignore
 2014-12-16 18:52:27 +00:00
Evan Hazlett 888181245e use vpc-id and zone instead of subnet-id for ec2 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-15 22:38:57 -05:00
Nathan LeClaire 77fe4a4e6e Add .git to .dockerignore 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-15 18:01:21 -08:00
Ben Firshman f43a0f2a9a Merge pull request #106 from nathanleclaire/modify_osarch 
Allow optional override of OS and arch in build (speed up compilation)
 2014-12-16 01:50:22 +00:00
Nathan LeClaire b350a99bec Allow optional override of os and arch in build 
With this change machine will still cross-compile for all supported OSes
/ archs by default, but allows user to customize args to the build
script.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2014-12-15 14:12:17 -08:00
Ben Firshman 7a425647a0 Merge pull request #97 from bfirsh/cli-regressions 
Fix CLI regressions
 2014-12-15 19:04:47 +00:00
Ben Firshman 4049f7ed22 Rename ~/.docker/hosts to ~/.docker/machines 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-15 10:55:40 -08:00
Ben Firshman a913c06888 Restore sorting of ls output 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-15 10:46:35 -08:00
Ben Firshman 91172449c0 Handle errors in commands 
Some errors were swallowed entirely, some didn't print the error
message.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-15 10:45:55 -08:00
Ben Firshman da95ea3968 Merge pull request #103 from ggiamarchi/machine-name-optional 
Make machine name optional in CLI
 2014-12-15 17:53:30 +00:00
Ben Firshman e401c4464c Merge pull request #101 from ggiamarchi/fix-interactive-ssh 
Fix bug SSH interactive mode
 2014-12-15 17:52:53 +00:00
Guillaume Giamarchi d730d39c48 Avoid code duplication 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-14 02:11:24 +01:00
Guillaume Giamarchi 8613b941e8 Make machine name optional in CLI 
For commands inspect, ip, kill and restart.
It is already implemented for the others.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-14 02:09:08 +01:00
Guillaume Giamarchi 6c5da2bc0e Fix bug SSH interactive mode 
Commit b44db20 introduced a bug that broke
the SSH interactive mode. If no command is
provided, Driver.GetSSHCommand is called with
an empty string instead of no parameter.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-13 18:46:52 +01:00
Ben Firshman 477fffb1ba Merge pull request #35 from ehazlett/driver-aws 
amazon ec2 driver
 2014-12-13 01:15:26 +00:00
Ben Firshman 6d9e7313f5 Merge pull request #96 from bfirsh/update-version 
Update version to 0.0.2
 2014-12-13 00:37:47 +00:00