Merge pull request #86 from GoogleCloudPlatform/develop-app

Adding develop app

Author: Jon Wayne Parrott

.dockerignore

@@ -4,3 +4,5 @@ env
 __pycache__
 .cache
 tests
+develop
+.tox

DEVELOPING.md

@@ -48,8 +48,4 @@ This will build the base image and then deploy the application. Once it's done d
 
 ## Developing
 
-When developing, it's best to use the `tests-e2e` app as a guide:
-
-* Build a custom version of the base image.
-* Write an app with a custom dockerfile that extends from your custom base image.
-* Deploy the app.
+When developing, refer to the developing app under [`/develop`](develop).

develop/.dockerignore

@@ -0,0 +1,3 @@
+*.pyc
+__pycache__
+.cache

develop/.gitignore

@@ -0,0 +1 @@
+Dockerfile

develop/Dockerfile.in

@@ -0,0 +1,4 @@
+FROM $DOCKER_IMAGE_NAME
+
+ADD . /app/
+RUN pip install -r /app/requirements.txt

develop/Makefile

@@ -0,0 +1,16 @@
+include ../common.mk
+
+.PHONY: all
+all: deploy
+
+.PHONY: deploy
+deploy: build-base generate-dockerfile
+	gcloud preview app deploy -q
+
+.PHONY: build-base
+build-base:
+	$(MAKE) -C .. push
+
+.PHONY: generate-dockerfile
+generate-dockerfile:
+	sed "s#\$$DOCKER_IMAGE_NAME#$(DOCKER_IMAGE_NAME)#g" Dockerfile.in > Dockerfile

develop/README.md

@@ -0,0 +1,14 @@
+# Development App
+
+This is a barebones app to use when developing changes to the core runtime components, such as the base docker image and vmruntime library.
+
+This works by:
+
+1. Building a custom version of the base image and pushing it to gcr.io.
+2. Building the app's image using the custom base image.
+
+This allows you to replicate the end-to-end image building process while developing. The end-to-end test app uses the same build method.
+
+## Usage
+
+Just use `make all`.

develop/app.yaml

@@ -0,0 +1,9 @@
+runtime: custom
+vm: true
+
+handlers:
+- url: .*
+  script: main.app
+
+manual_scaling:
+  instances: 1

develop/main.py

@@ -0,0 +1,25 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import webapp2
+
+
+class IndexHandler(webapp2.RequestHandler):
+    def get(self):
+        self.response.out.write('Index.')
+
+
+app = webapp2.WSGIApplication([
+    ('/', IndexHandler),
+], debug=True)