Skip to content

Commit

Permalink
Fix docker for mac. Bump to 0.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
abiosoft committed Jan 22, 2017
1 parent 0883ee1 commit 3efb7b9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
binaries/
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ Docker 1.10 and docker deamon running.

## Installation

### Homebrew (OSX only)
```sh
brew install dockward
```

### Binary
Download binary for other platforms on the [releases](https://github.com/abiosoft/dockward/releases) page.
Download binary for other platforms on the [releases](https://github.com/abiosoft/dockward/releases) page or replace download link accordingly for OSX.
```sh
curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.2/dockward_linux_amd64.tar.gz \
curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.4/dockward_linux_amd64.tar.gz \
&& tar xvfz dockward_linux_amd64.tar.gz \
&& sudo mv dockward_linux_amd64 /usr/local/bin/dockward \
&& sudo chmod +x /usr/local/bin/dockward
Expand All @@ -26,7 +31,7 @@ curl -LO https://github.com/abiosoft/dockward/releases/download/0.0.2/dockward_l
### Source
Requires Go.
```sh
go get github.com/abiosoft/dockward
go get -v -u github.com/abiosoft/dockward
```

## Usage
Expand Down
21 changes: 11 additions & 10 deletions cli/cli.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cli

import (
"errors"
"flag"
"fmt"
"io/ioutil"
Expand All @@ -10,12 +11,12 @@ import (
)

const (
AppName = "dockward"
Version = "0.0.3"
Usage = `Usage: dockward [options...] <port> [<container port> <filter>] [endpoints...]
appName = "dockward"
appVersion = "0.0.4"
appUsage = `Usage: dockward [options...] <port> [<container port> <filter>] [endpoints...]
try 'dockward --help' for more.
`
FullUsage = `Usage: dockward [options...] <port> [<container port> <filter>] [endpoints...]
appFullUsage = `Usage: dockward [options...] <port> [<container port> <filter>] [endpoints...]
options:
--host=false Host mode, forward to host endpoints instead of container.
Expand Down Expand Up @@ -75,24 +76,24 @@ func parseCli() cliConf {
exitIfErr(err)

if conf.Help {
fmt.Println(FullUsage)
fmt.Println(appFullUsage)
exit(nil)
}
if conf.Version {
fmt.Println(AppName, "version", Version)
fmt.Println(appName, "version", appVersion)
exit(nil)
}

switch fs.NArg() {
case 0:
usageErr(fmt.Errorf("port missing."))
usageErr(errors.New("port missing"))
case 1:
if !conf.Host {
// docker mode
usageErr(fmt.Errorf("filter missing."))
usageErr(errors.New("filter missing"))
} else if !conf.remoteClient {
// host mode
usageErr(fmt.Errorf("endpoint(s) missing."))
usageErr(errors.New("endpoint(s) missing"))
}

}
Expand Down Expand Up @@ -140,7 +141,7 @@ func parseCli() cliConf {
}

func usageErr(err error) {
exit(fmt.Errorf("dockward: %v\n%v", err, Usage))
exit(fmt.Errorf("dockward: %v\n%v", err, appUsage))
}

func exitIfErr(err error) {
Expand Down

0 comments on commit 3efb7b9

Please # to comment.