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

Batch aggregation staging deploy #786

Merged
merged 23 commits into from
Jul 1, 2024
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
44 changes: 44 additions & 0 deletions .github/workflows/deploy_staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Deploy to Staging

on:
push:
branches:
- master
workflow_dispatch:

jobs:
build_and_push_image:
name: Build and Push Image
uses: zooniverse/ci-cd/.github/workflows/build_and_push_image.yaml@main
with:
repo_name: aggregation-for-caesar
commit_id: ${{ github.sha }}
latest: true
build_args: "REVISION=${{ github.sha }}"

deploy_staging:
name: Deploy to Staging
uses: zooniverse/ci-cd/.github/workflows/deploy_app.yaml@main
needs: build_and_push_image
with:
app_name: aggregation
repo_name: aggregation-for-caesar
commit_id: ${{ github.sha }}
environment: staging
deploy_check: false
secrets:
creds: ${{ secrets.AZURE_AKS }}

slack_notification:
name: Slack notification
uses: zooniverse/ci-cd/.github/workflows/slack_notification.yaml@main
needs: deploy_staging
if: always()
with:
commit_id: ${{ github.sha }}
job_name: Deploy to Staging / deploy_app
status: ${{ needs.deploy_staging.result }}
title: "Aggregation Staging deploy complete"
title_link: "https://aggregation-staging.zooniverse.org"
secrets:
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
14 changes: 6 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: '2'
version: '3'
services:
aggregation:
build:
context: ./
args:
REVISION: fake-git-sha-id
image: aggregation-for-caesar:local
volumes:
- ./:/usr/src/aggregation
- ~/.aws:/root/.aws
Expand All @@ -25,11 +26,8 @@ services:
- redis:redis

worker:
build:
context: ./
args:
REVISION: fake-git-sha-id
command: celery --app panoptes_aggregation.tasks.celery worker --loglevel=info
image: aggregation-for-caesar:local
command: celery --app panoptes_aggregation.batch_aggregation.celery worker --loglevel=info
volumes:
- ./:/usr/src/aggregation
environment:
Expand All @@ -44,8 +42,8 @@ services:
- redis

dashboard:
build: .
command: celery --app panoptes_aggregation.tasks.celery flower --port=5555 --broker=redis://redis:6379/0
image: aggregation-for-caesar:local
command: celery --app panoptes_aggregation.batch_aggregation.celery flower --port=5555 --broker=redis://redis:6379/0
ports:
- 5556:5555
environment:
Expand Down
Loading