diff --git a/.env b/.env new file mode 100644 index 0000000..7550b87 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +LISTEN=:8080 +NATS=nats://localhost:4222 diff --git a/Dockerfile b/Dockerfile index 7ccb12a..3a67740 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,13 @@ FROM golang:1.11-rc-alpine as build RUN apk add --no-cache git=2.18.1-r0 WORKDIR /src -COPY go.mod go.sum *.go ./ +COPY go.mod go.sum .env *.go ./ RUN go get -d -v ./... RUN CGO_ENABLED=0 go build -ldflags "-s -w" FROM scratch COPY --from=build /src/bite /bite +COPY --from=build /src/.env /.env ENTRYPOINT ["/bite"] diff --git a/README.md b/README.md index 3436449..1705510 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ Beep backend handling of audio bites. Chopped up words spoken are uploaded into go build && ./backend-bite ``` -## Flags +## Environment Variables -Flags are supplied to the compiled go program in the form ```-flag=stuff```. +Supply environment variables by either exporting them or editing ```.env```. -| Flag | Description | Default | +| ENV | Description | Default | | ---- | ----------- | ------- | -| listen | Port number to listen on | 8080 | -| nats | URL of NATS | nats://localhost:4222 | +| LISTEN | Host and port number to listen on | :8080 | +| NATS | Host and port of nats | nats://localhost:4222 | ## API diff --git a/go.mod b/go.mod index cee0ebd..f1cbc14 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,7 @@ module bite require ( github.com/golang/protobuf v1.2.1-0.20190205222052-c823c79ea157 + github.com/joho/godotenv v1.3.0 github.com/julienschmidt/httprouter v1.2.0 github.com/nats-io/gnatsd v1.4.1 // indirect github.com/nats-io/go-nats v1.7.0 diff --git a/go.sum b/go.sum index ead9d0e..0b80a41 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.1-0.20190205222052-c823c79ea157 h1:SdQMHsZ18/XZCHuwt3IF+dvHgYTO2XMWZjv3XBKQqAI= github.com/golang/protobuf v1.2.1-0.20190205222052-c823c79ea157/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/nats-io/gnatsd v1.4.1 h1:RconcfDeWpKCD6QIIwiVFcvForlXpWeJP7i5/lDLy44= diff --git a/main.go b/main.go index cfbdaa8..44b09c7 100644 --- a/main.go +++ b/main.go @@ -1,15 +1,16 @@ package main import ( - "flag" "net/http" "log" + "os" "strconv" "time" "github.com/julienschmidt/httprouter" "github.com/nats-io/go-nats" "github.com/golang/protobuf/proto" + "github.com/joho/godotenv" ) var listen string @@ -18,10 +19,13 @@ var natsHost string var natsConn *nats.Conn func main() { - // Parse flags - flag.StringVar(&listen, "listen", ":8080", "host and port to listen on") - flag.StringVar(&natsHost, "nats", "nats://localhost:4222", "host and port of NATS") - flag.Parse() + // Load .env + err := godotenv.Load() + if err != nil { + log.Fatal("Error loading .env file") + } + listen = os.Getenv("LISTEN") + natsHost = os.Getenv("NATS") // NATS client natsConn, err := nats.Connect(natsHost)