Merge pull request #177 from GoogleCloudPlatform/runtime-python

Moving mvm samples to runtime: python

Author: Jonathan Wayne Parrott

container_engine/django_tutorial/requirements.txt

@@ -1,4 +1,4 @@
 Django==1.9.2
 mysqlclient==1.3.7
-wheel==0.28.0
+wheel==0.29.0
 gunicorn==19.4.5

managed_vms/analytics/.dockerignore

@@ -1,5 +1,9 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT main:app
+
+runtime_config:
+  python_version: 3
 
 #[START env]
 env_variables:

managed_vms/analytics/Dockerfile

@@ -59,6 +59,6 @@ def track_example():
 
 if __name__ == '__main__':
     # This is used when running locally. Gunicorn is used to run the
-    # application on Google App Engine. See CMD in Dockerfile.
+    # application on Google App Engine. See entrypoint in app.yaml.
     app.run(host='127.0.0.1', port=8080, debug=True)
 # [END app]

managed_vms/analytics/app.yaml

@@ -1,5 +1,9 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT main:app
+
+runtime_config:
+  python_version: 3
 
 #[START env]
 env_variables:

managed_vms/analytics/main.py

@@ -81,5 +81,5 @@ def index():
 
 if __name__ == '__main__':
     # This is used when running locally. Gunicorn is used to run the
-    # application on Google App Engine. See CMD in Dockerfile.
+    # application on Google App Engine. See entrypoint in app.yaml.
     app.run(host='127.0.0.1', port=8080, debug=True)

managed_vms/cloudsql/.dockerignore

@@ -1,5 +1,9 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT main:app
+
+runtime_config:
+  python_version: 3
 
 # [START env_variables]
 env_variables:

managed_vms/cloudsql/Dockerfile

@@ -66,5 +66,5 @@ def index():
 
 if __name__ == '__main__':
     # This is used when running locally. Gunicorn is used to run the
-    # application on Google App Engine. See CMD in Dockerfile.
+    # application on Google App Engine. See entrypoint in app.yaml.
     app.run(host='127.0.0.1', port=8080, debug=True)

managed_vms/cloudsql/app.yaml

@@ -1,2 +1,6 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT main:app
+
+runtime_config:
+  python_version: 3

managed_vms/cloudsql/main.py

@@ -43,5 +43,5 @@ def index():
 
 if __name__ == '__main__':
     # This is used when running locally. Gunicorn is used to run the
-    # application on Google App Engine. See CMD in Dockerfile.
+    # application on Google App Engine. See entrypoint in app.yaml.
     app.run(host='127.0.0.1', port=8080, debug=True)

managed_vms/datastore/.dockerignore

@@ -1,14 +1,9 @@
-# This file specifies your Python application's runtime configuration
-# including URL routing, versions, static file uploads, etc. See
-# https://developers.google.com/appengine/docs/python/config/appconfig
-# for details.
-
-# TODO: Enter your application id below. If you have signed up
-# using cloud.google.com/console use the "project id" for your application
-# id.
 # [START runtime]
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT mysite.wsgi
 
+runtime_config:
+  python_version: 3
 # [END runtime]
 

managed_vms/datastore/Dockerfile

@@ -1,4 +1,4 @@
 Django==1.9.2
 mysqlclient==1.3.7
-wheel==0.28.0
+wheel==0.29.0
 gunicorn==19.4.5

managed_vms/datastore/app.yaml

@@ -1,2 +1,6 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT main:app
+
+runtime_config:
+  python_version: 3

managed_vms/datastore/main.py

@@ -27,6 +27,6 @@ def hello():
 
 if __name__ == '__main__':
     # This is used when running locally. Gunicorn is used to run the
-    # application on Google App Engine. See CMD in Dockerfile.
+    # application on Google App Engine. See entrypoint in app.yaml.
     app.run(host='127.0.0.1', port=8080, debug=True)
 # [END app]

managed_vms/disk/.dockerignore

@@ -4,7 +4,7 @@ This sample demonstrates using [Python on Google App Engine Managed VMs](https:/
 
 ### Running & deploying the sample
 
-1. Requirements.txt is not automatically processed by Google App Engine Managed VMs. To install dependencies for this sample, run:
+1. `requirements.txt` is automatically installed by the runtime when deploying, however, to run the sample locally you will need to install dependencies:
 
         $ pip install -t lib -r requirements.txt
 
@@ -14,4 +14,4 @@ This sample demonstrates using [Python on Google App Engine Managed VMs](https:/
 
 3. Deploy the sample:
 
-        $ appcfg.py update -A your-app-id .
+        $ gcloud preview app deploy

managed_vms/disk/Dockerfile

@@ -1,7 +1,5 @@
-version: 1
-runtime: python27
+runtime: python-compat
 vm: true
-api_version: 1
 threadsafe: true
 
 handlers:

managed_vms/disk/app.yaml

@@ -13,8 +13,8 @@ You can run locally using django's `manage.py`:
 
 Follow the standard deployment instructions in
 [the top-level README](../README.md). Google App Engine runs the application
-using [gunicorn](http://gunicorn.org/) as defined by `CMD` in
-[`Dockerfile`](Dockerfile). You can use a different WSGI container if you want, as
+using [gunicorn](http://gunicorn.org/) as defined by `entrypoint` in
+[`app.yaml`](app.yaml). You can use a different WSGI container if you want, as
 long as it listens for web traffic on port `$PORT` and is declared in
 [`requirements.txt`](requirements.txt).
 
@@ -34,7 +34,7 @@ Then, we added a simple view in `hellworld.views`, added the app to
 `project_name.urls`.
 
 In order to deploy to Google App Engine, we created a simple
-[`app.yaml`](app.yaml) and [`Dockerfile`](Dockerfile).
+[`app.yaml`](app.yaml).
 
 ## Database notice
 

managed_vms/disk/main.py

@@ -1,2 +1,6 @@
-runtime: custom
+runtime: python
 vm: true
+entrypoint: gunicorn -b :$PORT project_name.wsgi
+
+runtime_config:
+  python_version: 3