Merge pull request #22 from nats-io/include_nats_server

include nats-server in the image
nats-io · Dec 31, 2019 · 0cf7300 · 0cf7300
2 parents c00b7a6 + 917e0db
commit 0cf7300
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,9 @@
+FROM synadia/nats-server:2.2.0-JS-preview AS JS
+
 FROM synadia/nats-box:latest
 
+COPY --from=JS /nats-server /nats-server
+
 # goreleaser does the build
 COPY jsm /usr/local/bin/
 

diff --git a/jsm/main.go b/jsm/main.go
@@ -37,7 +37,7 @@ func main() {
 
 	jsm.HelpFlag.Short('h')
 
-	jsm.Flag("server", "NATS servers").Short('s').Default("localhost:4222").StringVar(&servers)
+	jsm.Flag("server", "NATS servers").Short('s').Default("localhost:4222").Envar("SERVERS").StringVar(&servers)
 	jsm.Flag("creds", "User credentials").StringVar(&creds)
 	jsm.Flag("tlscert", "TLS public certificate").ExistingFileVar(&tlsCert)
 	jsm.Flag("tlskey", "TLS private key").ExistingFileVar(&tlsCert)

diff --git a/jsm/obs_command.go b/jsm/obs_command.go
@@ -247,6 +247,8 @@ func (c *obsCmd) createAction(pc *kingpin.ParseContext) (err error) {
 		c.cfg.AckPolicy = api.AckExplicit
 	}
 
+	c.cfg.AckWait = c.ackWait
+
 	if c.cfg.Delivery != "" {
 		if c.replyPolicy == "" {
 			mode := ""