centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 16:28:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,009 Commits 54 Branches 28 Tags
fc49adbcdfa1c6985fda170f5cac4fe009dee85d
Commit Graph

1009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Lorenc
17536555b1 New import path. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 15:45:10 -08:00
Dan Lorenc
328977c83e Made cmds constants. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 15:41:10 -08: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
Dan Lorenc
5525cf9f6f Proppy code review feedback. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-16 11:16:25 -08:00
Ben Firshman
808bde5b14 Merge pull request #107 from nathanleclaire/dockerignore 
A few additions to .dockerignore
 2014-12-16 18:52:27 +00:00
dlorenc
17d8b16a37 GCE Driver. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-15 20:23:38 -08: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
a94dde2b54 Add a Makefile 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-14 22:49:41 +01: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
Evan Hazlett
cb8a951bb8 added better error reporting 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-12 17:48:49 -05:00
Evan Hazlett
909e69baff initial work on aws for machine; huge thanks to @nathanleclaire for the 
initial implementation

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-12 17:00:57 -05:00
Ben Firshman
cdd9884de2 Merge pull request #93 from bfirsh/windows-file-path 
Moving path to filepath dependency
 2014-12-12 21:34:30 +00:00
Ben Firshman
bd375e2c1a Update version to 0.0.2 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-12 13:31:37 -08:00
Ben Firshman
81e1503737 Merge pull request #95 from ehazlett/fix-url-error 
fixes #94: url does not return active machine
 2014-12-12 21:31:08 +00:00
Evan Hazlett
2435f265f2 fixes #94: url does not return active machine 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-12 15:40:30 -05:00
Damien DUPORTAL
eda8bbd2bd Moving path to filepath dependency 
Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>

Conflicts:
	drivers/azure/azure.go
	store.go
	store_test.go
 2014-12-12 11:09:43 -08:00
Ben Firshman
5f54122dc6 Merge pull request #72 from sthulb/cli 
Implement new codegangsta/cli lib
 2014-12-12 18:46:02 +00:00
Simon Thulbourn
b44db20335 implements a -c/--command flag for ssh 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:28:30 +00:00
Simon Thulbourn
0295e00edb makes the name optional for stop/start/ssh/upgrade 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:11:38 +00:00
Simon Thulbourn
64c73597e2 adds codegangsta/cli 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:11:17 +00:00
Ben Firshman
e317d7d9f4 Merge pull request #89 from bfirsh/remove-mitchellh-homedir 
Remove mitchellh/go-homedir from godeps
 2014-12-12 01:14:21 +00:00
Ben Firshman
e12df0cbc2 Merge pull request #87 from ggiamarchi/machine-ls-sort 
Sort `machine ls` output by machine name
 2014-12-12 01:14:12 +00:00
Guillaume Giamarchi
d8921ee432 Move HostListItem from host.go to command.go 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 01:53:24 +01:00
Guillaume Giamarchi
8797ca2d50 Rename HostState struct to HostListItem 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 01:44:34 +01:00
Ben Firshman
ee48b4ae01 Remove mitchellh/go-homedir from godeps 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-11 16:24:04 -08:00
Ben Firshman
ee98043c5a Merge pull request #88 from MSOpenTech/homedir 
Fix #68. Homedir is now detected same as Docker.
 2014-12-12 00:22:53 +00:00
Jeff Mendoza
52019047f1 Fix #68. Homedir is now detected same as Docker. 
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
 2014-12-11 16:11:23 -08:00
Guillaume Giamarchi
1547a48dde Sort machine ls output by machine name 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 00:39:08 +01:00