Fix build ENVs. Fix if intercom keys are undefined

Author: thejsj

ansible/group_vars/alpha-api-base.yml

@@ -10,12 +10,7 @@ restart_policy: always
 sendgrid_key: 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
 
 dockerfile_enviroment: [
-  "NPM_TOKEN {{ npm_token }}",
-  "BIG_POPPA_HOST {{ big_poppa_host_address }}:{{ big_poppa_port }}",
-  "CREAM_HOST {{ cream_host_address }}:{{ cream_port }}",
-  "RABBITMQ_HOSTNAME {{ rabbit_host_address }}",
-  "RABBITMQ_PASSWORD {{ rabbit_password }}",
-  "RABBITMQ_PORT {{ rabbit_port }}"
+  "NPM_TOKEN {{ npm_token }}"
 ]
 dockerfile_pre_install_commands: [
    'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc'

ansible/group_vars/alpha-cream-http.yml

@@ -21,8 +21,8 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ cream_hello_runnable_github_token }}
   -e PORT={{ hosted_ports[0] }}
-  -e INTERCOM_API_KEY={{ cream_intercom_key | default('undefined') }}
-  -e INTERCOM_APP_ID={{ cream_intercom_id | default('undefined') }}
+  {% if cream_intercom_key is defined %} -e INTERCOM_API_KEY={{ cream_intercom_key }} {% endif %}
+  {% if cream_intercom_id is defined %} -e INTERCOM_APP_ID={{ cream_intercom_id }} {% endif %}
   -e NODE_ENV={{ node_env }}
   -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}

ansible/group_vars/alpha-cream-worker.yml

@@ -20,8 +20,8 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ cream_hello_runnable_github_token }}
   -e NODE_ENV={{ node_env }}
-  -e INTERCOM_API_KEY={{ cream_intercom_key | default('undefined') }}
-  -e INTERCOM_APP_ID={{ cream_intercom_id | default('undefined') }}
+  {% if cream_intercom_key is defined %} -e INTERCOM_API_KEY={{ cream_intercom_key }} {% endif %}
+  {% if cream_intercom_id is defined %} -e INTERCOM_APP_ID={{ cream_intercom_id }} {% endif %}
   -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
   -e RABBITMQ_PORT={{ rabbit_port }}