Skip to content
Draft
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
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ jobs:
name: "Docker: Build containers and collect static files"
command: |
docker compose up -d
docker compose exec django python manage.py collectstatic --noinput
docker compose exec django python manage.py migrate
docker compose exec django python ./manage.py createsuperuser --no-input

- run:
name: "Get compute worker, site worker and django logs"
Expand All @@ -77,6 +74,8 @@ jobs:
- run:
name: "Tests: Run end-to-end (E2E) tests"
command: |
docker compose exec django python ./manage.py createsuperuser --no-input
docker compose exec django python ./manage.py collectstatic --no-input
cd tests && CI=True $HOME/.local/bin/uv run pytest test_auth.py test_account_creation.py test_competition.py test_submission.py
no_output_timeout: 30m

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_cw_image-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '!develop'
- '!master'
paths:
- Dockerfile.compute_worker
- packaging/container/Containerfile.compute_worker
- compute_worker/**
jobs:
build_push_image:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v5
- name: Build Image
run: docker build -t codalab/codabench-compute-worker:${{ github.ref_name }} -f Dockerfile.compute_worker .
run: docker build -t codalab/codabench-compute-worker:${{ github.ref_name }} -f packaging/container/Containerfile.compute_worker .
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_cw_image-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- develop
paths:
- Dockerfile.compute_worker
- packaging/container/Containerfile.compute_worker
- compute_worker/**
jobs:
build:
Expand All @@ -14,7 +14,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v5
- name: Build Image
run: docker build -t codalab/codabench-compute-worker:test -f Dockerfile.compute_worker .
run: docker build -t codalab/codabench-compute-worker:test -f packaging/container/Containerfile.compute_worker .
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_cw_image-prod.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: build_CW_docker_image_branch
name: build_CW_docker_image_master
on:
push:
tags:
- '*'
paths:
- Dockerfile.compute_worker
- packaging/container/Containerfile.compute_worker
- compute_worker/**
jobs:
build:
Expand All @@ -14,7 +14,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v5
- name: Build Image
run: docker build -t codalab/codabench-compute-worker:${{ github.ref_name }} -f Dockerfile.compute_worker .
run: docker build -t codalab/codabench-compute-worker:${{ github.ref_name }} -f packaging/container/Containerfile.compute_worker .
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down
21 changes: 0 additions & 21 deletions Dockerfile

This file was deleted.

10 changes: 0 additions & 10 deletions Dockerfile.builder

This file was deleted.

34 changes: 0 additions & 34 deletions Dockerfile.compute_worker

This file was deleted.

31 changes: 0 additions & 31 deletions Dockerfile.flower

This file was deleted.

Loading