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

1062 Commits

Author SHA1 Message Date
Nathan LeClaire 333b7e88a7 Implement docker-machine scp 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-13 17:22:42 -07:00
Evan Hazlett 37bfe3a1dd Merge pull request #1166 from ehazlett/amazonec2-instance-profile-env-var 
amazonec2: instance profile env var
 2015-05-13 16:36:28 -04:00
Evan Hazlett cb6eb6bb77
amazonec2: instance profile env var 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-13 15:00:52 -04:00
Evan Hazlett 29256e907c Merge pull request #1161 from nathanleclaire/cert_fixes 
Fix a few issues with certs
 2015-05-13 11:01:08 -04:00
Evan Hazlett f29c5fc4dc Merge pull request #1086 from zchee/ec2-add-monitoring-flag 
[EC2] Add Monitoring flag
 2015-05-13 10:49:14 -04:00
Evan Hazlett e999ebb824 Merge pull request #1129 from ehazlett/easier-env-display 
env: enable easier usage display
 2015-05-13 10:40:07 -04:00
Nathan LeClaire 7f6d19ff47 Fix a few issues with certs 
- regenerate-certs was busted, because of recent changes I made to
  Provision() method
- checksum was different between local certs and remote certs

This PR fixes both issues and adds tests to verify that both conditions
are checked in the future.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-12 15:11:23 -07:00
Evan Hazlett 00a2f7781f env: enable easier usage display 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-12 08:43:15 -04:00
Evan Hazlett aec395502e Merge pull request #1125 from hairyhenderson/ls-filter-1076 
Adding --filter flag to ls command
 2015-05-12 08:10:58 -04:00
Evan Hazlett 9c92fd934a Merge pull request #1132 from ehazlett/provisioner-update-package-manager 
provisioner: update metadata before install or upgrade
 2015-05-12 08:09:04 -04:00
Evan Hazlett 68eaa5282d Merge pull request #1152 from hairyhenderson/fix-cli-integration-tests 
Fixing cli.bats tests
 2015-05-12 08:08:20 -04:00
Dave Henderson a3c8b3474e Adding --filter flag to ls command 
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-11 20:01:50 -04:00
Evan Hazlett 8ed87c37c2 Merge pull request #1155 from nathanleclaire/engine_opt 
Migrate engine-flag => engine-opt
 2015-05-11 15:43:58 -04:00
Nathan LeClaire b672617287 Migrate engine-flag => engine-opt 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-11 11:57:09 -07:00
Dave Henderson 96c1d994ec Fixing cli.bats tests 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-11 09:55:34 -04:00
Evan Hazlett 197e35a021
use var block for updating metadata 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-11 09:44:34 -04:00
Evan Hazlett b3d39ca81d Merge pull request #1146 from clnperez/log-ssh-err-output 
If there was an SSH error, log the output
 2015-05-11 09:33:03 -04:00
Christy Perez 91d945431f Log ssh command output to Debug 
I struggled to figure out why a machine create was failing, and
eventually asked if anyone else had seen the vague error I was getting:
"Error creating machine: Process exited with: 100. Reason was: ()"

It is immensely helpful if we log the command output instead of
just the rc.

It would also have been useful if the driver providers used the output, but
this covers most scenarios since they don't.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-05-08 09:35:59 -05:00
Evan Hazlett 08ebaa01d0 Merge pull request #1143 from ibuildthecloud/fix-panic-2 
Fix panic when TCP timeout happens on SSH connect
 2015-05-07 13:57:01 -07:00
Darren Shepherd 732ca874b8 Fix panic when TCP timeout happens on SSH connect 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-07 13:44:33 -07:00
Evan Hazlett ccc26904bb Merge pull request #1139 from nathanleclaire/whitespace_nits 
Fix up some whitespace nits
 2015-05-07 13:36:55 -07:00
Evan Hazlett a3e08a010d Merge pull request #1108 from ibuildthecloud/vbox-sleep 
Fix issue where GetIP in VirtualBox failes due to no SSH
 2015-05-07 13:33:26 -07:00
Evan Hazlett f3bcda1cff Merge pull request #1137 from nathanleclaire/fixup 
Fix formatting and non-returning of error
 2015-05-07 11:52:40 -07:00
Evan Hazlett 782e3aac11 Merge pull request #1135 from frapposelli/fusion-cpu-fix 
CPU count fixes to `vmwarefusion`
 2015-05-07 11:52:09 -07:00
Nathan LeClaire 9196d3e1d4 Fix up some whitespace nits 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-07 10:12:21 -07:00
Nathan LeClaire 8887ca2fed Fix formatting and non-returning of error 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 17:52:29 -07:00
Fabio Rapposelli 13c1006f3b CPU count fixes to `vmwarefusion` 
- Added `--vmwarefusion-cpu-count` parameter
- Defaults to 1 Virtual CPU

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-05-07 02:16:20 +02:00
Evan Hazlett d97dfa69f9 Merge pull request #1131 from nathanleclaire/ssh_timeout 
Add retries for SSH dial timeout
 2015-05-06 16:13:20 -07:00
Evan Hazlett 6d784fb2fb Merge pull request #1133 from nathanleclaire/fix_upgrade_need_started 
Add check for machine state before upgrade
 2015-05-06 16:10:49 -07:00
Evan Hazlett 7aa8364a4a Merge pull request #1117 from ehazlett/fix-windows-shell-detection 
windows: fix shell detection to not bail on bash envs
 2015-05-06 15:54:37 -07:00
Nathan LeClaire e152ecc30b Add check for machine state before upgrade 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 13:20:33 -07:00
Evan Hazlett 5adfb8b3f0
provisioner: update metadata before install or upgrade 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-06 13:18:46 -07:00
Nathan LeClaire aa6325dadb Add retries for SSH dial timeout 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 12:59:46 -07:00
Evan Hazlett ce0e365e10 Merge pull request #1130 from nathanleclaire/fix_quiet_ls 
Fix bug with quiet ls mode
 2015-05-06 12:55:21 -07:00
Nathan LeClaire 8c34f80940 Fix bug with quiet ls mode 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 11:48:16 -07:00
Evan Hazlett c3f15e9c3e Merge pull request #1120 from nathanleclaire/fix_b2d_upgrade 
Fix Windows ISO rename issue
 2015-05-06 11:26:15 -07:00
Nathan LeClaire cfcd0a75dd Fix Windows ISO rename issue 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-05 15:00:55 -07:00
Evan Hazlett a5bee2996f Merge pull request #1121 from nathanleclaire/skip_build 
Add environment variable option to skip docker build in script/build
 2015-05-05 14:46:53 -07:00
Nathan LeClaire f1c7577f82 Add environment variable option to skip docker build 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-05 14:39:13 -07:00
Evan Hazlett 3b0a32f6d8 Merge pull request #1118 from nathanleclaire/fix_env 
Fix failing env validation
 2015-05-05 14:33:08 -07:00
Nathan LeClaire 6bb56f91d3 Fix failing env validation 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-05 13:51:22 -07:00
Evan Hazlett a7d63161ec Merge pull request #406 from ehazlett/driver-generic 
Generic Driver
 2015-05-05 13:47:12 -07:00
Evan Hazlett 031e257f9c Merge pull request #993 from ehazlett/windows-vbox-share 
Windows vbox share
 2015-05-05 12:42:21 -07:00
Evan Hazlett c4dd9198c1
windows: fix shell detection to not bail on bash envs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 12:19:53 -07:00
Evan Hazlett 60be4c292c virtualbox: windows share support 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:31:43 -07:00
Evan Hazlett 10afd2da8a Merge pull request #1107 from hairyhenderson/softlayer-panic 
Fixing panic when d.deviceConfig is nil
 2015-05-05 11:13:54 -07:00
Evan Hazlett 0060b1cf4b
generic: update docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:10:51 -07:00
Evan Hazlett 9030986a63
generic: pretty struct format 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:08:45 -07:00
Evan Hazlett e9e0fa5cfc
generic: remove unneeded check for ssh user 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:07:45 -07:00
Evan Hazlett e6159ce6c9
generic: reduce wait time for GetState 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:05:47 -07:00