Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Frontend V2 docker container from staging and prod docker files #3375

Merged
merged 1 commit into from
Mar 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions docker-compose-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
34 changes: 8 additions & 26 deletions docker-compose-staging.yml
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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
Expand All @@ -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

Expand Down