Skip to content

Commit 69f93e2

Browse files
committed
devapp: remove App Engine code
This change removes all but the / and /release endpoints, moving things around and deleting all App Engine-specific code while attempting to not make many core logic changes (those will come in a follow-up change). Updates golang/go#20691 Change-Id: Ie8fa184578177cc2cb3c070e9108cf27d9e6f689 Reviewed-on: https://go-review.googlesource.com/46832 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 53a3d0e commit 69f93e2

33 files changed

+386
-2338
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
devappserver
1+
devapp
22
ca-certificates.crt

devapp/devappserver/Dockerfile renamed to devapp/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
FROM scratch
55
LABEL maintainer "[email protected]"
66
COPY ca-certificates.crt /etc/ssl/certs/
7-
COPY devappserver /
8-
ENTRYPOINT ["/devappserver"]
7+
COPY devapp /
8+
COPY static /static
9+
ENTRYPOINT ["/devapp"]

devapp/Dockerfile.0

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright 2017 The Go Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style
3+
# license that can be found in the LICENSE file.
4+
FROM golang:1.8
5+
LABEL maintainer "[email protected]"
6+
7+
RUN go get -d github.com/google/go-github/github && \
8+
cd /go/src/github.com/google/go-github && git reset --hard 7a51fb928f52a196d5f31daefb8a489453ef54ff
9+
10+
RUN go get -d golang.org/x/net/http2 && \
11+
cd /go/src/golang.org/x/net && git reset --hard fe686d45ea04bc1bd4eff6a52865ce8757320325
12+
13+
RUN go get -d golang.org/x/sync/errgroup && \
14+
cd /go/src/golang.org/x/sync && git reset --hard f52d1811a62927559de87708c8913c1650ce4f26
15+
16+
RUN go get -d cloud.google.com/go/compute/metadata && \
17+
go get -d cloud.google.com/go/storage && \
18+
cd /go/src/cloud.google.com/go && git reset --hard 23179f286bc31e07fba2eddaa540fb999b1b1fd9
19+
20+
RUN go get -d golang.org/x/crypto/acme/autocert && \
21+
cd /go/src/golang.org/x/crypto && git reset --hard adbae1b6b6fb4b02448a0fc0dbbc9ba2b95b294d
22+
23+
# Optimization to speed COPY+go install steps later. This go install
24+
# isn't required for correctness.
25+
RUN go install \
26+
github.com/google/go-github/github \
27+
golang.org/x/sync/errgroup \
28+
cloud.google.com/go/compute/metadata \
29+
cloud.google.com/go/storage \
30+
golang.org/x/crypto/acme/autocert
31+
32+
COPY . /go/src/golang.org/x/build/
33+
34+
RUN go install -ldflags "-linkmode=external -extldflags '-static -pthread'" golang.org/x/build/devapp

devapp/devappserver/Makefile renamed to devapp/Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# license that can be found in the LICENSE file.
44

55
VERSION=latest
6-
DOCKER_IMAGE_build0=build0/devappserver:latest
7-
DOCKER_CTR_build0=devappserver-build0
6+
DOCKER_IMAGE_build0=build0/devapp:latest
7+
DOCKER_CTR_build0=devapp-build0
88

99
build0: *.go Dockerfile.0
10-
docker build --force-rm -f Dockerfile.0 --tag=$(DOCKER_IMAGE_build0) ../..
10+
docker build --force-rm -f Dockerfile.0 --tag=$(DOCKER_IMAGE_build0) ../
1111

12-
devappserver: build0
12+
devapp: build0
1313
docker create --name $(DOCKER_CTR_build0) $(DOCKER_IMAGE_build0)
1414
docker cp $(DOCKER_CTR_build0):/go/bin/$@ $@
1515
docker rm $(DOCKER_CTR_build0)
@@ -19,17 +19,17 @@ ca-certificates.crt:
1919
docker cp $(DOCKER_CTR_build0):/etc/ssl/certs/$@ $@
2020
docker rm $(DOCKER_CTR_build0)
2121

22-
docker-prod: Dockerfile devappserver ca-certificates.crt
23-
docker build --force-rm --tag=gcr.io/symbolic-datum-552/devappserver:$(VERSION) .
24-
docker-dev: Dockerfile devappserver ca-certificates.crt
25-
docker build --force-rm --tag=gcr.io/go-dashboard-dev/devappserver:latest .
22+
docker-prod: Dockerfile devapp ca-certificates.crt
23+
docker build --force-rm --tag=gcr.io/symbolic-datum-552/devapp:$(VERSION) .
24+
docker-dev: Dockerfile devapp ca-certificates.crt
25+
docker build --force-rm --tag=gcr.io/go-dashboard-dev/devapp:latest .
2626

2727
push-prod: docker-prod
28-
gcloud docker -- push gcr.io/symbolic-datum-552/devappserver:$(VERSION)
28+
gcloud docker -- push gcr.io/symbolic-datum-552/devapp:$(VERSION)
2929
push-dev: docker-dev
30-
gcloud docker -- push gcr.io/go-dashboard-dev/devappserver:latest
30+
gcloud docker -- push gcr.io/go-dashboard-dev/devapp:latest
3131

3232
.PHONY: clean
3333
clean:
34-
$(RM) devappserver
34+
$(RM) devapp
3535
$(RM) ca-certificates.crt

devapp/devappserver/README.md renamed to devapp/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# devappserver
1+
# devapp
22

33
## Local development
44

55
```sh
6-
$ make devappserver
7-
$ ./devappserver -http=:8080
6+
$ make devapp
7+
$ ./devapp
88
```
99

10-
Then visit http://localhost:8080
10+
Then visit http://localhost:6343
1111

1212
## Deployment
1313

devapp/app.yaml

Lines changed: 0 additions & 39 deletions
This file was deleted.

devapp/appengine.go

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)