From c4809bbe215d44ad663a5cb845b13817ed9b0f18 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Wed, 11 Mar 2020 13:11:36 +0100 Subject: [PATCH] feat: add a name to be more human friendly. (#29) --- README.md | 5 +++++ app.go | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/README.md b/README.md index 4123cf7..5f9c871 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Tiny Go webserver that prints os information and HTTP request to output - `cert`: give me a certificate. - `key`: give me a key. - `port`: give me a port number. (default: 80) +- `name`: give me a name. (it can be also defined with `WHOAMI_NAME` environment variable) ## Examples @@ -63,3 +64,7 @@ $ curl -v http://localhost:80/health < Date: Mon, 16 Sep 2019 22:52:40 GMT < Content-Length: 0 ``` + +```console +docker run -d -P -v ./certs:/certs --name iamfoo containous/whoami --cert /certs/cert.cer --key /certs/key.key +``` diff --git a/app.go b/app.go index d52124e..ee07eac 100644 --- a/app.go +++ b/app.go @@ -31,11 +31,13 @@ const ( var cert string var key string var port string +var name string func init() { flag.StringVar(&cert, "cert", "", "give me a certificate") flag.StringVar(&key, "key", "", "give me a key") flag.StringVar(&port, "port", "80", "give me a port number") + flag.StringVar(&name, "name", os.Getenv("WHOAMI_NAME"), "give me a name") } var upgrader = websocket.Upgrader{ @@ -149,6 +151,10 @@ func whoamiHandler(w http.ResponseWriter, req *http.Request) { } } + if name != "" { + _, _ = fmt.Fprintln(w, "Name:", name) + } + hostname, _ := os.Hostname() _, _ = fmt.Fprintln(w, "Hostname:", hostname)