From bb3baf8ee8564c98875e9214c16a2784a63036d6 Mon Sep 17 00:00:00 2001
From: Ram81 <ramramrakhya81@gmail.com>
Date: Wed, 8 Sep 2021 17:17:43 -0400
Subject: [PATCH 1/2] Deploy Frontend V2 on staging

---
 docker/prod/nodejs_v2/nginx_staging.conf | 6 +++---
 scripts/deployment/deploy.sh             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/prod/nodejs_v2/nginx_staging.conf b/docker/prod/nodejs_v2/nginx_staging.conf
index 86dd7e669b..64c084f436 100644
--- a/docker/prod/nodejs_v2/nginx_staging.conf
+++ b/docker/prod/nodejs_v2/nginx_staging.conf
@@ -2,9 +2,9 @@ upstream django_app {
   server django:8000 fail_timeout=0;
 }
 
-upstream node_exporter {
-  server node_exporter:9100 fail_timeout=0;
-}
+# upstream node_exporter {
+#   server node_exporter:9100 fail_timeout=0;
+# }
 
 server {
   server_name staging.eval.ai;
diff --git a/scripts/deployment/deploy.sh b/scripts/deployment/deploy.sh
index bfafef8f71..b56aa606ac 100755
--- a/scripts/deployment/deploy.sh
+++ b/scripts/deployment/deploy.sh
@@ -50,7 +50,7 @@ case $opt in
 					aws s3 cp s3://cloudcv-secrets/evalai/${env}/docker_${env}.env ./docker/prod/docker_${env}.env
 					docker-compose -f docker-compose-${env}.yml rm -s -v -f
 					docker-compose -f docker-compose-${env}.yml pull django nodejs celery
-					docker-compose -f docker-compose-${env}.yml up -d --force-recreate --remove-orphans django nodejs celery
+					docker-compose -f docker-compose-${env}.yml up -d --force-recreate --remove-orphans django nodejs nodejs_v2 celery
 				ENDSSH2
 				ssh ubuntu@${MONITORING_INSTANCE} -o StrictHostKeyChecking=no AWS_ACCOUNT_ID=${AWS_ACCOUNT_ID} COMMIT_ID=${COMMIT_ID} env=${env} 'bash -s' <<-'ENDSSH2'
 					source venv/bin/activate

From 6db13469f190693612d5b9ebb6374702abe80847 Mon Sep 17 00:00:00 2001
From: Ram81 <ramramrakhya81@gmail.com>
Date: Wed, 8 Sep 2021 17:18:30 -0400
Subject: [PATCH 2/2] Deploy Frontend V2 on staging

---
 docker-compose-staging.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index f7dccfa0d1..51bc69bddd 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -49,7 +49,6 @@ services:
         NODE_ENV: staging
     ports:
       - '80:80'
-      - "443:443"
     volumes:
       - /code/node_modules
       - /code/bower_components
@@ -61,7 +60,7 @@ services:
         awslogs-create-group: 'true'
 
   nodejs_v2:
-    image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-production-frontend-v2:${COMMIT_ID}
+    image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-frontend-v2:${COMMIT_ID}
     build:
       context: ./
       dockerfile: docker/prod/nodejs_v2/Dockerfile
@@ -69,13 +68,14 @@ services:
         NODE_ENV: staging
     ports:
       - "9999:80"
+      - "443:443"
     volumes:
       - /code/node_modules
     logging:
       driver: awslogs
       options:
         awslogs-region: us-east-1
-        awslogs-group: nodejs_production_v2
+        awslogs-group: nodejs_staging_v2
         awslogs-create-group: "true"
 
   remote-worker: