updates for Cloud Run stuff

Change-Id: I8005525ce4e755f2c39280e118752f2ef488a626

Author: wescpy

step4-cloudds-cloudrun-py3/README.md

@@ -29,8 +29,8 @@ See Step 4a (see `step4a-cloudrun-bldpks-py3`) if interested in using Buildpacks
 
 Learning how to use Cloud Run is not within the scope of this tutorial, so refer to the Quickstart above or the general [Cloud Run docs](https://cloud.google.com/run/docs). Containerizing your app for Cloud Run means no longer using App Engine. This means all App Engine configuration files will be replaced by Docker config files. You'll also have to tweak your code a bit to tell the container to launch the web server and start your app — these things were originally handled by App Engine automatically.
 
-1. Delete `app.yaml` and `appengine_config.py` config files as they're not used with Cloud Run.
-1. Delete the `lib` folder for the same reason.
+1. Delete the `app.yaml` as it's not used with Cloud Run.
+1. If you just migrated to Python 3, you may have some Python 2 leftovers like `appengine_config.py` & a `lib` folder; delete those too.
 1. Add a `Dockerfile` with the container specifications and optionally a `.dockerignore` file as well.
 1. The `requirements.txt` and `templates/index.html` are fine to leave as-is.
 1. Modify `main.py` to start up the Flask app.
@@ -66,6 +66,7 @@ Cloud Run starts its web server on port 8080, automatically injected into the `P
 
 ```python
 if __name__ == '__main__':
+    import os
     app.run(debug=True, threaded=True, host='0.0.0.0',
             port=int(os.environ.get('PORT', 8080)))
 ```

step4-cloudndb-cloudrun-py2/README.md

@@ -66,6 +66,7 @@ Cloud Run starts its web server on port 8080, automatically injected into the `P
 
 ```python
 if __name__ == '__main__':
+    import os
     app.run(debug=True, threaded=True, host='0.0.0.0',
             port=int(os.environ.get('PORT', 8080)))
 ```

step4-cloudndb-cloudrun-py2/main.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 from flask import Flask, render_template, request
 from google.cloud import ndb
 
@@ -39,5 +38,6 @@ def root():
     return render_template('index.html', visits=visits)
 
 if __name__ == '__main__':
+    import os
     app.run(debug=True, threaded=True, host='0.0.0.0',
             port=int(os.environ.get('PORT', 8080)))

step4a-cloudrun-bldpks-py3/main.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from datetime import datetime
-import os
 from flask import Flask, render_template, request
 from google.cloud import datastore
 
@@ -40,5 +39,6 @@ def root():
     return render_template('index.html', visits=visits)
 
 if __name__ == '__main__':
+    import os
     app.run(debug=True, threaded=True, host='0.0.0.0',
             port=int(os.environ.get('PORT', 8080)))

step4a-cloudrun-bldpks-py3/service.yaml

@@ -25,5 +25,5 @@ spec:
       annotations: {}
     spec:
       containers:
-        - image: gcr.io/wescpy-gae3/image
-      serviceAccountName: docker-client1@wescpy-gae3.iam.gserviceaccount.com
+        - image: gcr.io/PROJECT_ID/image
+      serviceAccountName: docker-client1@PROJECT_ID.iam.gserviceaccount.com