Merge pull request GoogleCloudPlatform#23 from GoogleCloudPlatform/no-need-for-environment-variables

Jon Wayne Parrott · Jon Wayne Parrott · commit d3fea3108e36 · 2016-02-11T16:23:32.000-08:00
Removing unnecessary use of environment variables
diff --git a/6-pubsub/app.yaml b/6-pubsub/app.yaml
@@ -21,18 +21,10 @@ vm: true
 
 # [START entrypoint]
 # Instead of using gunicorn directly, we'll use Honcho. Honcho is a python port
-# of the Foreman process manager. $PROCESSES is set by app.yaml / worker.yaml
-# to control which processes Honcho will start.
-entrypoint: honcho start -f /app/procfile $PROCESSES
+# of the Foreman process manager. For the default module, only the
+# frontend process is needed.
+entrypoint: honcho start -f /app/procfile bookshelf
 # [END entrypoint]
 
 runtime_config:
   python_version: 3
-
-# [START env_variables]
-env_variables:
-  # Processes is passed to Honcho via the entrypoint to run a particular set
-  # of processes for this App Engine module. For the default module, only the
-  # frontend process is needed.
-  PROCESSES: bookshelf
-# [END env_variables]
diff --git a/6-pubsub/worker.yaml b/6-pubsub/worker.yaml
@@ -21,20 +21,12 @@ module: worker
 runtime: python
 vm: true
 
-# [START entrypoint]
 # Instead of using gunicorn directly, we'll use Honcho. Honcho is a python port
-# of the Foreman process manager. $PROCESSES is set by app.yaml / worker.yaml
-# to control which processes Honcho will start.
-entrypoint: honcho start -f /app/procfile $PROCESSES
-# [END entrypoint]
+# of the Foreman process manager. For the worker module, both the queue worker
+# and the monitor process are needed.
+entrypoint: honcho start -f /app/procfile worker monitor
 
 runtime_config:
   python_version: 3
+# [END worker]
 
-# [START env_variables]
-env_variables:
-  # Processes is passed to Honchovia the entrypoint to run a particular set
-  # of processes for this App Engine module. For the worker module, both the
-  # queue worker and the monitor process are needed.
-  PROCESSES: worker monitor
-# [END env_variables]
diff --git a/optional-container-engine/Dockerfile b/optional-container-engine/Dockerfile
@@ -36,6 +36,6 @@ RUN pip install -r /app/requirements.txt
 ADD . /app
 
 # Instead of using gunicorn directly, we'll use Honcho. Honcho is a python port
-# of the Foreman process manager. $PROCESSES is set by app.yaml / worker.yaml
+# of the Foreman process manager. $PROCESSES is set in the pod manifest
 # to control which processes Honcho will start.
 CMD honcho start -f /app/procfile $PROCESSES
