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

[FrontendV2] Deploy Frontend V2 on staging #3594

Merged
merged 2 commits into from
Sep 8, 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
6 changes: 3 additions & 3 deletions docker-compose-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ services:
NODE_ENV: staging
ports:
- '80:80'
- "443:443"
volumes:
- /code/node_modules
- /code/bower_components
Expand All @@ -61,21 +60,22 @@ 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
args:
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:
Expand Down
6 changes: 3 additions & 3 deletions docker/prod/nodejs_v2/nginx_staging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion scripts/deployment/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down