From 2f408b7326d166150bd276ae125a92ef461f1411 Mon Sep 17 00:00:00 2001
From: Rishabh Jain <rishabhjain2018@gmail.com>
Date: Sun, 28 Mar 2021 14:58:05 -0400
Subject: [PATCH] Remove Frontend V2 docker container from staging and prod
 docker files(#3375)

---
 docker-compose-production.yml | 18 ------------------
 docker-compose-staging.yml    | 34 ++++++++--------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index 3b46e15ec3..fb0d4659e2 100644
--- a/docker-compose-production.yml
+++ b/docker-compose-production.yml
@@ -60,24 +60,6 @@ services:
         awslogs-group: nodejs_production
         awslogs-create-group: "true"
 
-  # nodejs_v2:
-  #   image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-production-frontend-v2:${COMMIT_ID}
-  #   build:
-  #     context: ./
-  #     dockerfile: docker/prod/nodejs_v2/Dockerfile
-  #     args:
-  #       NODE_ENV: production
-  #   ports:
-  #     - "9999:80"
-  #   volumes:
-  #     - /code/node_modules
-  #   logging:
-  #     driver: awslogs
-  #     options:
-  #       awslogs-region: us-east-1
-  #       awslogs-group: nodejs_production_v2
-  #       awslogs-create-group: "true"
-
   remote-worker:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-production-remote-worker:${COMMIT_ID}
     build:
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index aee6b4ad9f..9458224baa 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   django:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-backend:${COMMIT_ID}
@@ -8,13 +8,13 @@ services:
       context: ./
       dockerfile: docker/prod/django/Dockerfile
     ports:
-      - "8000:8000"
+      - '8000:8000'
     logging:
       driver: awslogs
       options:
         awslogs-region: us-east-1
         awslogs-group: django_staging
-        awslogs-create-group: "true"
+        awslogs-create-group: 'true'
 
   celery:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-celery:${COMMIT_ID}
@@ -30,7 +30,7 @@ services:
       options:
         awslogs-region: us-east-1
         awslogs-group: celery_staging
-        awslogs-create-group: "true"
+        awslogs-create-group: 'true'
 
   worker:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-worker:${COMMIT_ID}
@@ -48,8 +48,8 @@ services:
       args:
         NODE_ENV: staging
     ports:
-      - "80:80"
-      - "443:443"
+      - '80:80'
+      - '443:443'
     volumes:
       - /code/node_modules
       - /code/bower_components
@@ -58,32 +58,14 @@ services:
       options:
         awslogs-region: us-east-1
         awslogs-group: nodejs_staging
-        awslogs-create-group: "true"
-
-  # nodejs_v2:
-  #   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
-  #     args:
-  #       NODE_ENV: staging
-  #   ports:
-  #     - "9999:80"
-  #   volumes:
-  #     - /code/node_modules
-  #   logging:
-  #     driver: awslogs
-  #     options:
-  #       awslogs-region: us-east-1
-  #       awslogs-group: nodejs_staging_v2
-  #       awslogs-create-group: "true"
+        awslogs-create-group: 'true'
 
   remote-worker:
     image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/evalai-staging-remote-worker:${COMMIT_ID}
     build:
       context: ./
       dockerfile: docker/prod/worker/Dockerfile
-    command: ["python", "-m", "scripts.workers.remote_submission_worker"]
+    command: ['python', '-m', 'scripts.workers.remote_submission_worker']
     env_file:
       - docker/prod/docker_remote_worker.env