Merge pull request #2175 from codalab/develop

Merge Develop into Master (v1.24)

Author: Didayolo

.circleci/config.yml

@@ -24,7 +24,9 @@ jobs:
 
       - run:
           name: "Setup: Copy environment variables"
-          command: cp .env_circleci .env
+          command: |
+            cp .env_circleci .env
+            cp my-postgres_sample.conf my-postgres.conf
 
       - run:
           name: "Setup: Create directories for MinIO (cannot be made by docker for some reason)"
@@ -53,9 +55,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"
@@ -77,6 +76,7 @@ jobs:
       - run:
           name: "Tests: Run end-to-end (E2E) tests"
           command: |
+            docker compose exec django python ./manage.py createsuperuser --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
 

.env_sample

@@ -1,5 +1,8 @@
 SECRET_KEY=change-this-secret
 
+# For local setup and debug
+DEBUG=True
+
 # Database
 DB_HOST=db
 DB_NAME=postgres
@@ -67,6 +70,8 @@ AWS_STORAGE_PRIVATE_BUCKET_NAME=private
 # NOTE! port 9000 here should match $MINIO_PORT
 AWS_S3_ENDPOINT_URL=http://minio:9000/
 AWS_QUERYSTRING_AUTH=False
+# Optional URL rewriting in compute worker, format: FROM | TO
+#WORKER_BUNDLE_URL_REWRITE=http://localhost:9000|http://minio:9000
 
 
 # -----------------------------------------------------------------------------
@@ -111,4 +116,4 @@ ENABLE_SIGN_IN=True
 # Logging (Serialized outputs the logs in JSON format)
 # -----------------------------------------------------------------------------
 LOG_LEVEL=info
-SERIALIZED=false
+SERIALIZED=false

.github/workflows/build_cw_image-branch.yml

@@ -7,7 +7,7 @@ on:
       - '!develop'
       - '!master'
     paths:
-      - Dockerfile.compute_worker
+      - packaging/container/Containerfile.compute_worker
       - compute_worker/**
 jobs:
   build_push_image:
@@ -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:

.github/workflows/build_cw_image-dev.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - develop
     paths:
-      - Dockerfile.compute_worker
+      - packaging/container/Containerfile.compute_worker
       - compute_worker/**
 jobs:
   build:
@@ -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:

.github/workflows/build_cw_image-prod.yml

@@ -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:
@@ -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:

.gitignore

@@ -24,10 +24,12 @@ src/static/generated/*
 db.sqlite3
 
 celerybeat-schedule
+celerybeat-schedule.db
 package-lock.json
 artifacts/
 
 docker-compose.override.yml
+compose.override.yml
 
 server_config.yaml
 /graphs/
@@ -40,3 +42,5 @@ caddy_config/
 caddy_data/
 
 home_page_counters.json
+my-postgres.conf
+tests/config/state.json