Skip to content

Commit 21a5b12

Browse files
authored
Merge branch 'master' into patch-3
2 parents 84dcfc2 + 75bf2c1 commit 21a5b12

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
run "02_read-scanner"
22

3-
run "07_dial-write"
3+
run "06_dial-write"

023_serving-files/02_serving/04_FileServer/01/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
func main() {
99
http.Handle("/", http.FileServer(http.Dir(".")))
10-
http.HandleFunc("/dog", dog)
10+
http.HandleFunc("/dog/", dog)
1111
http.ListenAndServe(":8080", nil)
1212
}
1313

1414
func dog(w http.ResponseWriter, req *http.Request) {
1515
w.Header().Set("Content-Type", "text/html; charset=utf-8")
16-
io.WriteString(w, `<img src="http://github.com/toby.jpg">`)
16+
io.WriteString(w, `<img src="http://github.com/%3Cspan%20class="x x-first x-last">/toby.jpg">`)
1717
}

026_appengine-deploy/01/app.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
application: temp-145415
2-
version: 1
3-
runtime: go
4-
api_version: go1
1+
runtime: go113
52

63
handlers:
74
- url: /.*
8-
script: _go_app
5+
script: auto
6+
secure: always

026_appengine-deploy/02/app.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
application: temp-145415
2-
version: 1
3-
runtime: go
4-
api_version: go1
1+
runtime: go113
52

63
handlers:
74
- url: /.*
8-
script: _go_app
5+
script: auto
6+
secure: always

026_appengine-deploy/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# buying a domain
1+
# buying a domain
22

33
https://domains.google/#/
44

@@ -12,10 +12,16 @@ https://domains.google/#/
1212

1313
```
1414
runtime: go113
15+
handlers:
16+
- url: /.*
17+
script: auto
18+
secure: always
1519
```
16-
- deploy to that project
20+
- deploy to that project. update --project with your project-id
1721
```
1822
gcloud app deploy app.yaml --project=<YOUR_PROJECT_ID> -v 1
23+
my example:
24+
gcloud app deploy --project temp-137512
1925
```
2026
- view your project
2127
- http://YOUR_PROJECT_ID.appspot.com/

0 commit comments

Comments
 (0)