aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2021-06-01 10:04:38 -0400
committerRuss Cox <rsc@golang.org>2021-06-16 18:38:43 +0000
commitc725e441291aec017e7052ba8e776c59a7295764 (patch)
tree6d02c7f04c098b451f8c37fb3a25a4a5d4152574
parent7fe5e1bf67352dcc963c4a663acdb283be7ff1c8 (diff)
downloadgo-x-website-c725e441291aec017e7052ba8e776c59a7295764.tar.xz
go.dev: clean up deployment
Delete separate learn service files, since the service has been deleted. (learn.go.dev is now served by the same service as go.dev.) Also make the yaml commands a bit more readable. Change-Id: I8c453cb38bef84eb1d795e949c9bc315360c0deb Reviewed-on: https://go-review.googlesource.com/c/website/+/323896 Trust: Russ Cox <rsc@golang.org> Reviewed-by: Jamal Carvalho <jamal@golang.org>
-rw-r--r--go.dev/.firebaserc6
-rw-r--r--go.dev/app.learn.yaml8
-rw-r--r--go.dev/app.staging.learn.yaml8
-rw-r--r--go.dev/app.staging.yaml3
-rw-r--r--go.dev/app.yaml5
-rw-r--r--go.dev/cloudbuild.yaml3
6 files changed, 8 insertions, 25 deletions
diff --git a/go.dev/.firebaserc b/go.dev/.firebaserc
deleted file mode 100644
index 663d35d0..00000000
--- a/go.dev/.firebaserc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "projects": {
- "staging": "go-dev-staging",
- "prod": "go-dev-prod"
- }
-}
diff --git a/go.dev/app.learn.yaml b/go.dev/app.learn.yaml
deleted file mode 100644
index 467eb454..00000000
--- a/go.dev/app.learn.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-runtime: go115
-service: learn-go-dev
-main: ./cmd/frontend
-
-handlers:
- - url: /.*
- secure: always
- script: auto
diff --git a/go.dev/app.staging.learn.yaml b/go.dev/app.staging.learn.yaml
deleted file mode 100644
index 6484cc25..00000000
--- a/go.dev/app.staging.learn.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-runtime: go115
-service: staging-learn-go-dev
-main: ./cmd/frontend
-
-handlers:
- - url: /.*
- secure: always
- script: auto
diff --git a/go.dev/app.staging.yaml b/go.dev/app.staging.yaml
index 261d9e9b..65c2d31a 100644
--- a/go.dev/app.staging.yaml
+++ b/go.dev/app.staging.yaml
@@ -1,3 +1,6 @@
+# This app is deployed via Cloud Build as directed by cloudbuild.staging.yaml.
+# Do not deploy directly.
+
runtime: go115
service: staging-go-dev
main: ./cmd/frontend
diff --git a/go.dev/app.yaml b/go.dev/app.yaml
index eb67097a..b9e5b4f3 100644
--- a/go.dev/app.yaml
+++ b/go.dev/app.yaml
@@ -1,6 +1,9 @@
+# This app is deployed via Cloud Build as directed by cloudbuild.yaml.
+# Do not deploy directly.
+
runtime: go115
service: go-dev
-main: ./cmd/frontend
+main: ./go.dev/cmd/frontend
handlers:
- url: /.*
diff --git a/go.dev/cloudbuild.yaml b/go.dev/cloudbuild.yaml
index 2d929189..080164e5 100644
--- a/go.dev/cloudbuild.yaml
+++ b/go.dev/cloudbuild.yaml
@@ -12,8 +12,7 @@ steps:
dir: go.dev
- name: "gcr.io/cloud-builders/gcloud"
entrypoint: bash
- args: ["../go-app-deploy.sh", "app.yaml"]
- dir: go.dev
+ args: ["./go-app-deploy.sh", "go.dev/app.yaml"]
- name: 'mirror.gcr.io/library/golang'
args: [
"go", "run", "./cmd/versionprune", "--dry_run=false",