From 6b560fb9043570c4c122540120958a8bc40fe0d1 Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Tue, 3 Jul 2018 12:04:49 -0700
Subject: [PATCH] in process changes to start kubernetes

---
 docker-cloud.yml   | 40 +++++++++++++++++++++++++++++++++-------
 docker-compose.yml |  2 ++
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/docker-cloud.yml b/docker-cloud.yml
index 82502897..14cacb6b 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -8,11 +8,11 @@ services:
     ports:
       - '27017:27017'
     environment:
-      - MONGO_INITDB_ROOT_USERNAME
-      - MONGO_INITDB_ROOT_PASSWORD
-      - MONGO_INITDB_DATABASE
-      - MONGO_RW_USERNAME
-      - MONGO_RW_PASSWORD
+      - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME}
+      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
+      - MONGO_INITDB_DATABASE=${MONGO_INITDB_DATABASE}
+      - MONGO_RW_USERNAME=${MONGO_RW_USERNAME}
+      - MONGO_RW_PASSWORD=${MONGO_RW_PASSWORD}
   nginx:
     image: nginx:1.13
     volumes:
@@ -23,11 +23,37 @@ services:
       - app
   app:
     image: catarak/p5.js-web-editor
+    # this is so infuriating that i have to map EVERY ENV VARIABLE
     environment:
       - MONGO_URL=mongodb://mongo:27017/p5js-web-editor
       - MONGO_HOSTNAME=mongo
-      # - API_URL=https://localhost/api
-      # - PORT=80
+      - MONGO_PORT=${MONGO_PORT}
+      - MONGO_NAME=${MONGO_NAME}
+      - PORT=${PORT}
+      - SESSION_SECRET=${SESSION_SECRET}
+      - AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
+      - AWS_SECRET_KEY=${AWS_SECRET_KEY}
+      - S3_BUCKET=${S3_BUCKET}
+      - AWS_REGION=${AWS_REGION}
+      - GITHUB_ID=${GITHUB_ID}
+      - GITHUB_SECRET=${GITHUB_SECRET}
+      - MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
+      - MAILGUN_KEY=${MAILGUN_KEY}
+      - EMAIL_SENDER=${EMAIL_SENDER}
+      - EMAIL_VERIFY_SECRET_TOKEN=${EMAIL_VERIFY_SECRET_TOKEN}
+      - S3_BUCKET_URL_BASE=${S3_BUCKET_URL_BASE}
+      - GG_EXAMPLES_USERNAME=${GG_EXAMPLES_USERNAME}
+      - GG_EXAMPLES_PASS=${GG_EXAMPLES_PASS}
+      - GG_EXAMPLES_EMAIL=${GG_EXAMPLES_EMAIL}
+      - GOOGLE_ID=${GOOGLE_ID}
+      - GOOGLE_SECRET=${GOOGLE_SECRET}
+      - EXAMPLE_USER_EMAIL=${EXAMPLE_USER_EMAIL}
+      - EXAMPLE_USER_PASSWORD=${EXAMPLE_USER_PASSWORD}
+      - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME}
+      - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
+      - MONGO_INITDB_DATABASE=${MONGO_INITDB_DATABASE}
+      - MONGO_RW_USERNAME=${MONGO_RW_USERNAME}
+      - MONGO_RW_PASSWORD=${MONGO_RW_PASSWORD}
     volumes:
       - .:/opt/node/app
       - /opt/node/app/node_modules
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d518c9a..bfd6baf1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,8 @@ services:
       - '80:80'
     depends_on:
       - app
+    links:
+      - app
   app:
     build:
       context: .