diff --git a/.travis.yml b/.travis.yml index ffff6c1f..a90380cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ sudo: required language: go +# ~1 hour is too long to wait for an osx container, plus docker/dependencies dist: trusty go: diff --git a/README.md b/README.md index 816b5971..18738431 100644 --- a/README.md +++ b/README.md @@ -7,24 +7,28 @@ Once code is built and tested locally, Nanobox provisions and deploys an identical infrastructure on a production platform. + ## How It Works Nanobox uses [Virtual Box](http://virtualbox.org) and [Docker](https://www.docker.com/) to create virtual development environments on your local machine. App configuration is handled in the [boxfile.yml](https://docs.nanobox.io/boxfile/), a small yaml config file used to provision and configure your apps' environments both locally and in production. + ## Why Nanobox? Nanobox allows you to stop configuring environments and just code. It guarantees that any project you start will work the same for anyone else collaborating on the project. When it's time to launch the project, you'll know that your production app will work, because it already works locally. + ### Installation By using the [Nanobox installer](https://nanobox.io/download). *(Recommended)* .The installer includes all required dependencies (Virtual Box & Docker). ### Usage + ``` Usage: - [flags] - [command] + nanobox [flags] + nanobox [command] Available Commands: configure Configure Nanobox. @@ -47,19 +51,20 @@ Available Commands: update-images Updates docker images. evar Manage environment variables. dns Manage dns aliases for local applications. - log View and streams application logs. + log Streams application logs. version Show the current Nanobox version. server Start a dedicated nanobox server Flags: --debug In the event of a failure, drop into debug context - -h, --help help for + -h, --help help for nanobox -t, --trace Increases display output and sets level to trace -v, --verbose Increases display output and sets level to debug -Use " [command] --help" for more information about a command. +Use "nanobox [command] --help" for more information about a command. ``` + ### Documentation - Nanobox documentation is available at [docs.nanobox.io](https://docs.nanobox.io/). @@ -67,10 +72,13 @@ Use " [command] --help" for more information about a command. ## Contributing + Contributing to Nanobox is easy. Just follow these [contribution guidelines](https://docs.nanobox.io/contributing/). +Nanobox uses [govendor](https://github.com/kardianos/govendor#the-vendor-tool-for-go) to vendor dependencies. Use `govendor sync` to restore dependencies. + ### Contact -For help using Nanobox or if you have any questions/suggestions, please reach out to help@nanobox.io or find us on IRC at #nanobox (freenode). You can also [create a new issue on this project](https://github.com/nanobox-io/nanobox/issues/new). +For help using Nanobox or if you have any questions/suggestions, please reach out to help@nanobox.io or find us on [slack](https://slack.nanoapp.io/). You can also [create a new issue on this project](https://github.com/nanobox-io/nanobox/issues/new). -[![nanobox logo](http://nano-assets.gopagoda.io/open-src/nanobox-open-src.png)](http://nanobox.io/open-source) +[![nanobox logo](http://nano-assets.gopagoda.io/open-src/nanobox-open-src.png)](https://nanobox.io/open-source/) diff --git a/util/provider/dockermachine_mount.go b/util/provider/dockermachine_mount.go index bcc12e2f..980beca7 100644 --- a/util/provider/dockermachine_mount.go +++ b/util/provider/dockermachine_mount.go @@ -70,6 +70,7 @@ func (machine DockerMachine) AddMount(local, host string) error { } if machine.staleMount(host) { + lumber.Debug("Removing stale mount: %s", host) if err := machine.removeNativeMount(local, host); err != nil { return fmt.Errorf("failed to clean up stale mount: %s", err) } diff --git a/util/provider/share/share_darwin.go b/util/provider/share/share_darwin.go index 78edf613..0aaf8e7b 100644 --- a/util/provider/share/share_darwin.go +++ b/util/provider/share/share_darwin.go @@ -279,7 +279,10 @@ func cleanLine(line, lineCheck string) string { // split on spaces and remove mount options. also cleanup stray quotes paths := strings.Split(strings.Replace(line, lineCheck, "", 1), "\" \"") paths[0] = strings.Replace(paths[0], "\"", "", 1) - paths[len(paths)-1] = strings.Replace(paths[len(paths)-1], "\"", "", 1) + // the space in this `"\" "` is important. Prepending a space to lineCheck + // after it gets passed in might work too, assuming it doesn't have one + // already when getting passed in. + paths[len(paths)-1] = strings.Replace(paths[len(paths)-1], "\" ", "", 1) goodPaths := []string{} for _, path := range paths { diff --git a/vendor/vendor.json b/vendor/vendor.json index 09ece5d5..d3ab8f8a 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -351,7 +351,7 @@ "revisionTime": "2016-09-12T15:03:35Z" }, { - "checksumSHA1": "JMZI3mXrZwsQ+yE6DdC5Q7X+nI8=", + "checksumSHA1": "wTAYmbl1nt5HdkjblpnInPKhwp0=", "path": "github.com/nanobox-io/nanobox-boxfile", "revision": "213ff24b93f4b7de0a8067841612278c1995d393", "revisionTime": "2017-08-03T21:20:06Z" @@ -365,14 +365,14 @@ { "checksumSHA1": "5rOBGrnVJoymxI+FQn5tyHgbgcA=", "path": "github.com/nanopack/logvac/config", - "revision": "c84455c64d89c6a86c007edf436cd4301736293a", - "revisionTime": "2017-08-23T22:19:47Z" + "revision": "655f2ff0ed087cf7103f2bfdde0324019fabaf4c", + "revisionTime": "2017-09-07T18:11:09Z" }, { "checksumSHA1": "RI5cATdVXt1L8NoI0+8op9butCg=", "path": "github.com/nanopack/logvac/core", - "revision": "c84455c64d89c6a86c007edf436cd4301736293a", - "revisionTime": "2017-08-23T22:19:47Z" + "revision": "655f2ff0ed087cf7103f2bfdde0324019fabaf4c", + "revisionTime": "2017-09-07T18:11:09Z" }, { "checksumSHA1": "TTEICNRFfe8Q66Z1WqZt+J9X49g=",