aboutsummaryrefslogtreecommitdiff
path: root/content/context/server
diff options
context:
space:
mode:
authorAndrew Bonventre <andybons@golang.org>2018-05-24 14:41:55 -0400
committerAndrew Bonventre <andybons@golang.org>2018-05-24 20:12:49 +0000
commit6f984eca1cab903fc42e41d4663186c3f8930518 (patch)
treec05463ed903c6790b1b403b6ebc05ab95875ce8f /content/context/server
parent8ca53492445ae5839075ef6f4aebbd6d882981e9 (diff)
blog: clean up blog to allow usage with gcloud command
+ The app.yaml file needs to be in the same directory as the entry-point Go files, so those are moved from ./blog to ./ + Go files within the context article did not have the +build OMIT directive, so gcloud would view them as files that needed to be built at deploy time. Add the +build OMIT directive and use the context package instead of x/net/context. + Switch to using a service instead of version and update app.yaml to account for this. + Use 1.9 as the runtime. + Remove superfluous .gitignore Change-Id: I7c886849b912bc7f5b67cd2791cb6986d93d5cc7 Reviewed-on: https://go-review.googlesource.com/114455 Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'content/context/server')
-rw-r--r--content/context/server/server.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/context/server/server.go b/content/context/server/server.go
index 2504370..ebee9a1 100644
--- a/content/context/server/server.go
+++ b/content/context/server/server.go
@@ -1,3 +1,5 @@
+// +build OMIT
+
// The server program issues Google search requests and demonstrates the use of
// the go.net Context API. It serves on port 8080.
//
@@ -11,6 +13,7 @@
package main
import (
+ "context"
"html/template"
"log"
"net/http"
@@ -18,7 +21,6 @@ import (
"golang.org/x/blog/content/context/google"
"golang.org/x/blog/content/context/userip"
- "golang.org/x/net/context"
)
func main() {