app engine: copy app engine configuration to app.yaml and app.gotip.yaml
It doesn't look like `includes` works the way I thought it did. Just
copy configuration for now.
Change-Id: Id4ce037f116dc28d57b156cbe92e5ba38f17e91d
Reviewed-on: https://go-review.googlesource.com/c/playground/+/363234
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/app.gotip.yaml b/app.gotip.yaml
index 76ddb5c..5894c9e 100644
--- a/app.gotip.yaml
+++ b/app.gotip.yaml
@@ -1,3 +1,21 @@
service: gotipplay
-includes:
-- playground.yaml
+runtime: custom
+env: flex
+
+network:
+ name: projects/golang-org/global/networks/golang
+
+resources:
+ cpu: 2
+ memory_gb: 2
+
+automatic_scaling:
+ min_num_instances: 5
+
+readiness_check:
+ path: "/_ah/health"
+ check_interval_sec: 10
+
+env_variables:
+ MEMCACHED_ADDR: 'memcached-play-golang:11211'
+
diff --git a/app.yaml b/app.yaml
index f1db820..8790e8a 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,3 +1,21 @@
service: play
-includes:
-- playground.yaml
+runtime: custom
+env: flex
+
+network:
+ name: projects/golang-org/global/networks/golang
+
+resources:
+ cpu: 2
+ memory_gb: 2
+
+automatic_scaling:
+ min_num_instances: 5
+
+readiness_check:
+ path: "/_ah/health"
+ check_interval_sec: 10
+
+env_variables:
+ MEMCACHED_ADDR: 'memcached-play-golang:11211'
+
diff --git a/playground.yaml b/playground.yaml
deleted file mode 100644
index 65cdf39..0000000
--- a/playground.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Shared configuration for playground App Engine instances.
-runtime: custom
-env: flex
-
-network:
- name: projects/golang-org/global/networks/golang
-
-resources:
- cpu: 2
- memory_gb: 2
-
-automatic_scaling:
- min_num_instances: 5
-
-readiness_check:
- path: "/_ah/health"
- check_interval_sec: 10
-
-env_variables:
- MEMCACHED_ADDR: 'memcached-play-golang:11211'
-
