From 02948d2c863cafc00bda4a32e2183766a5002956 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Mon, 6 Apr 2020 07:57:47 -0700
Subject: [PATCH] Dockerfile: add some usage docs, bump to Go 1.14

---
 Dockerfile | 21 ++++++++++++++++++++-
 README.md  |  8 ++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3ffb942f7..11ffb9260 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,26 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-FROM golang:1.13-alpine AS build-env
+# This Dockerfile includes all the tailscale binaries.
+#
+# To build the Dockerfile:
+#
+#     $ docker build -t tailscale:tailscale .
+#
+# To run the tailscaled agent:
+#
+#     $ docker run -d --name=tailscaled -v /var/lib:/var/lib -v /dev/net/tun:/dev/net/tun --network=host --privileged tailscale:tailscale tailscaled
+#
+# To then log in:
+#
+#     $ docker exec tailscaled tailscale up
+#
+# To see status:
+#
+#     $ docker exec tailscaled tailscale status
+
+
+FROM golang:1.14-alpine AS build-env
 
 WORKDIR /go/src/tailscale
 
diff --git a/README.md b/README.md
index 403911cd1..80e8ad407 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@ https://pkgs.tailscale.com .
 go install tailscale.com/cmd/tailscale{,d}
 ```
 
-We only support the latest Go release and any Go beta or release
-candidate builds (currently Go 1.13.x or Go 1.14) in module mode. It
-might work in earlier Go versions or in GOPATH mode, but we're making
-no effort to keep those working.
+We only guarantee to support the latest Go release and any Go beta or
+release candidate builds (currently Go 1.14) in module mode. It might
+work in earlier Go versions or in GOPATH mode, but we're making no
+effort to keep those working.
 
 ## Bugs