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

50 Commits

Author SHA1 Message Date
Evan Hazlett 30c2086cdf Merge pull request #1304 from nathanleclaire/integration_continues 
Add some helpers and patch ups to the integration tests
 2015-06-05 11:07:44 -04:00
Nathan LeClaire e75b6a5e5f Add some helpers and patch ups to the integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-04 15:41:37 -07:00
Vincent Bernat 6d075aed02 test: don't invoke docker-machine directly 
Use `machine` helper for that.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-03 10:30:34 +02:00
Nathan LeClaire ed01843dc9 Refactor integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-02 10:10:52 -07:00
Nathan LeClaire 47bd262260 Implement configurable Swarm options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-26 10:18:34 -07:00
Evan Hazlett 7f3bfb3e87 Merge pull request #1206 from miketheman/vmwarefusion_1168 
Address vmwarefusion driver hang condition
 2015-05-22 09:57:17 -04:00
Mike Fiedler 67a5018999 Get machine state before looking up URL in vmwarefusion 
- Add a call to GetState() in GetIP() to bail if the machine is stopped,
  similar to how it is done in the virtualbox driver.
- Add tests for `url` and `env` commands.

Fixes #1168

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
 2015-05-20 23:40:07 -04:00
Mike Fiedler cd049cb4b9 Convert vmwarefusion bats tests back to `machine` 
In #615, the helper function `machine()` was created and used within the
vmwarefusion test suite (amongst others) to wrap a platform-specfic
binary during the test suite.

In #1034, it appears that this name was changed to the normal
docker-machine binary, which can incoke the system-installed one, not
the recently compiled one, potentially testing the incorrect binary.

See:
- https://github.com/docker/machine/pull/615#discussion_r25643553
- https://github.com/docker/machine/pull/1034/files#diff-62c88a2fede921556dbdeead731596b2R14

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
 2015-05-20 23:40:01 -04:00
Mike Fiedler 0282a7d544 Add tests for url/env commands when stopped w/virtualbox 
Refs #1168

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
 2015-05-20 23:39:52 -04:00
Nathan LeClaire 2f78b7f92a Move code to use SSH "backends" 
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-19 15:02:57 -07:00
Evan Hazlett 48c033e271 Merge pull request #1140 from nathanleclaire/new_scp 
Implement docker-machine scp
 2015-05-15 13:21:37 -04:00
Evan Hazlett bc0a552b26 Merge pull request #1162 from hairyhenderson/bats-arm-support 
Naming the binary properly on ARM when running integration tests
 2015-05-14 16:37:42 -04:00
Nathan LeClaire 333b7e88a7 Implement docker-machine scp 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-13 17:22:42 -07:00
Dave Henderson 2019448f5f Naming the binary properly on ARM when running the BATS tests 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-12 20:47:55 -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 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 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
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
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
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 fdc8538de4 Merge pull request #1109 from ibuildthecloud/no-default-storage-driver 
Default storage driver to "" and let provisioner choose default
 2015-05-05 10:46:47 -07:00
Darren Shepherd 43b5786001 Default storage driver to "" and let provisioner choose default 
The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-05 09:12:33 -07:00
Nathan LeClaire 23f071c76f Fix integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-04 19:01:29 -07:00
Vincent Bernat fd569c8fdf driver: exoscale driver 
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-30 22:32:02 +02:00
Evan Hazlett a3eb0d077b Merge pull request #1040 from nathanleclaire/engine_options 
Implement configurable engine options
 2015-04-30 13:55:58 -04:00
Nathan LeClaire 2574c8ba5d Implement configurable engine options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-29 17:58:14 -07:00
Aaron Welch 2a44f40f6c for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts 
Signed-off-by: Aaron Welch <welch@packet.net>
 2015-04-26 15:39:22 -04:00
Fabio Rapposelli 25583edbb3 Update VMware Fusion and vSphere driver to run boot2docker 1.6.0 
- Update custom ISO to docker 1.6.0.
- Shared folder support for VMware Fusion.
- Updated bats test for Fusion.

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-04-20 10:34:13 -07:00
Nathan LeClaire 9b5f395c60 Implement upgrade functionality for boot2docker 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-30 16:18:38 -07:00
Tom Barlow ddf633a9e4 Rebased, added env var test for virtualbox CPU count 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow 6e71cd3917 Replaced export statements in virtualbox integration tests with inline variables 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow f01b9ce800 Specifying env vars inline on BATS doesn't seem to work, switched to export 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow c221a0a42f Moved cleanup of machine store to end of virtualbox integration test 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Tom Barlow 0e1db73829 Added bats integration test for virtualbox customisation via env vars 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:49 +00:00
Evan Hazlett ee7617c2e7 Merge pull request #887 from nathanleclaire/listen_on_socket 
Fix unix:// not working inside VM issue
 2015-03-27 11:39:45 -07:00
Nathan LeClaire d6db67d0be Fix unix:// not working inside VM issue 
With the way that provisioning was implemented, there was an issue
getting connection to the UNIX socket to work with the new boot2docker
1.6rc2 ISO.  This issue is related to the fact that the docker
service was not truly stopped during the provisioning.  This PR fixes
the issue and provides some tests to help ensure that it does not come
up again.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-27 10:41:12 -07:00
Ken Pepple d80c47df88 add integration tests for cpu count (PR #879) in virtualbox driver 
Signed-off-by: Ken Pepple <ken@solinea.com>
 2015-03-25 20:40:50 -07:00
Ken Pepple a84cc1ee6b add integration tests for custom create options in virtualbox 
Signed-off-by: Ken Pepple <ken@solinea.com>
 2015-03-25 12:48:50 -07:00
Evan Hazlett a9277a7977 Merge pull request #833 from slashk/vbox-pause-saved-int-test 
add pause/savestate scnearios to virtualbox integration tests
 2015-03-23 20:11:04 -04:00
Ken Pepple 81a9765d35 add pause/savestate scnearios to virtualbox integration tests 
Signed-off-by: Ken Pepple <ken@solinea.com>
 2015-03-21 13:13:54 -07:00
Nathan LeClaire 3b2c8f9845 Migrate (swarmConfig) => (swarmOptions) 
and (SwarmConfig) => (SwarmOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (authConfig) => (authOptions)
        (AuthConfig) => (AuthOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Migrate (hostConfig) => (hostOptions)
        (HostConfig) => (HostOptions)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-20 23:20:11 -07:00
Evan Hazlett 68397cfced
bats updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-20 23:44:22 -04:00
Evan Hazlett 28789604e9 provisioner: finished migration functions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-20 23:17:42 -04:00
Evan Hazlett 4ca4a28788 libmachine: validate host config upon load 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-19 23:19:35 -04:00
Evan Hazlett da3da50897 DO: updated to new driver spec; updated integration tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-17 11:08:20 -04:00
Evan Hazlett 51aa826e14
digitalocean: update to driver interface 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-09 22:20:47 -04:00
Evan Hazlett 2b6daa29ed
update integration test for virtualbox 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-09 12:50:57 -04:00
Evan Hazlett ed4fa09311
more integration test robustness 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-07 18:19:15 -05:00