Rebase partners-logo (#1629)

* autorun collectstatic when django container starts, added caddy_data and caddy_config to gitignore * programs and datasets bug fixed * if condition format fixed * Downloading submissions witha stream v1 * updated toml file with python version and bpython version, deleted lock file, update dockerfile to not copy lock file and to generate lock file in the docker build * Change base image for Dockerfile.flower (#1520) * Change base image for Dockerfile.flower * Remove platform argument * Resources bundles dumps (#1505) * Add a Bundles tab in Resources view * add dump single and multiple deletion mechanism * add competition title in bundle name + add competition link in bundle resource tab * Update datasets.py (flake8) --------- Co-authored-by: OhMaley <[email protected]> Co-authored-by: Adrien Pavão <[email protected]> * Improve formatting * leaderboard api 500 error resolved (#1527) * leaderboard api 500 error resolved * flake issues resolved * Changed submission name to add ID when downloading many submissions (#1565) * changed submission name to add ID * Flake8 white space fix --------- Co-authored-by: Nicolas HOMBERG <[email protected]> * Server Status: submissions limit removed (#1562) * server status submissions limit removed, pagination added, monitor queues separated * renamed server status title to recent submissions * Email template fixes (#1567) * email logo fixed, some changes in email text * participant side email templates updated * task dataset/program removal fixed * Updated docker-compose to docker compose * whiltelist emails leaking fixed (#1560) * competition whitelist feature added * updated whitelist * Update whitelist note * whiltelist emails leaking fixed * Remove conflict --------- Co-authored-by: Adrien Pavão <[email protected]> * Updates to server_status and monitor_queues (#1568) * server_status and monitor_queues pages secured * Update monitor_queues.html * [Feature] Delete orphan files (#1575) * Add button for orphan files deletion + API routes and views * Fix flake8 formatting --------- Co-authored-by: OhMaley <[email protected]> * Fix string concat in case of no email in analytics api * Poetry error tentative fix (#1588) * Poetry error tentative fix * RabbitMQ static image in Dockerfile.rabbitmq to fix a recent bug * Reverted RabbitMQ image change * Fix Rabbit version --------- Co-authored-by: Obada Haddad <[email protected]> Co-authored-by: didayolo <[email protected]> * `Release PR#1` - Display release version in Codabench footer (#1583) * release version added to header * version moved to footer * Minor UI change --------- Co-authored-by: Adrien Pavão <[email protected]> * `Release PR#2` Release version will load dynamically from version.json (#1592) * release version added to header * version moved to footer * version on the website is now dynamic and will be loaded from the version.json file --------- Co-authored-by: Adrien Pavão <[email protected]> * `Release PR#3` created workflow for new releases (#1584) * created workflow for new releases * version json file added * typo fix * Update release-version-update.yml * Included realease url to navigate user to the url on click on the website * release json updated --------- Co-authored-by: Obada Haddad <[email protected]> Co-authored-by: Adrien Pavão <[email protected]> * Updates Sept 15-22 2024 (#1593) * jinja and pillow * jinja and pillow * Adding Versino_Bump_Instruction_README * Version_Bumps file * Version_Bumps file and req_treeFile updates * gunicorn from 20.0.4 to 22.0.0 * Bump requests from 2.20.0 to 2.32.2 * Bump django from 2.2.17 to 2.2.18 * Bump django from 2.2.18 to 2.2.19 and to 3.2.25 eventually * Bump django from 2.2.19 to 2.2.20 * Bump django from 2.2.20 to 2.2.25 * Bump django from 2.2.25 to 2.2.28 * Bump django from 2.2.25 to 2.2.28 * Version_Bumps.md text * Update Dockerfile (upgrade Python) * checking in some outstanding changes * Remove Version Bumps * removing version bumbs --------- Co-authored-by: Adrien Pavão <[email protected]> * organizers can now delete forum posts (#1613) Co-authored-by: Adrien Pavão <[email protected]> * bundles renamed to competition bundles, swapped postions of bundles and tasks (#1591) Co-authored-by: Adrien Pavão <[email protected]> --------- Co-authored-by: Ihsan Ullah <[email protected]> Co-authored-by: Nicolas HOMBERG <[email protected]> Co-authored-by: OhMaley <[email protected]> Co-authored-by: Obada Haddad <[email protected]> Co-authored-by: Obada Haddad-Soussac <[email protected]> Co-authored-by: Benjamin Bearce <[email protected]>
codalab · Oct 11, 2024 · 983c8dc · 983c8dc
1 parent 34b40e5
commit 983c8dc
Show file tree

Hide file tree

Showing 61 changed files with 2,272 additions and 1,304 deletions.
diff --git a/.github/workflows/release-version-update.yml b/.github/workflows/release-version-update.yml
@@ -0,0 +1,50 @@
+name: Update version.json and create PR
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  update-version:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Get release information
+      id: get_release
+      uses: dawidd6/action-get-latest-release@v3
+      with:
+        release: true
+
+    - name: Update version.json
+      run: |
+        echo '{
+          "tag_name": "${{ steps.get_release.outputs.tag_name }}",
+          "release_name": "${{ steps.get_release.outputs.name }}",
+          "published_at": "${{ steps.get_release.outputs.published_at }}",
+          "body": "${{ steps.get_release.outputs.body }}"
+          "release_url": "${{ steps.get_release.outputs.html_url }}"
+        }' > version.json
+
+    - name: Create new branch
+      run: |
+        git checkout -b update-version-${{ steps.get_release.outputs.tag_name }}
+        git add version.json
+        git commit -m "Update version.json for release ${{ steps.get_release.outputs.tag_name }}"
+
+    - name: Push branch
+      run: |
+        git push origin update-version-${{ steps.get_release.outputs.tag_name }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v5
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: update-version-${{ steps.get_release.outputs.tag_name }}
+        title: "Update version.json for release ${{ steps.get_release.outputs.tag_name }}"
+        body: "This PR updates version.json with the latest release information."
+        base: develop  # Target branch for the pull request
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,6 @@ server_config.yaml
 
 .DS_Store
 .DS_Store?
+
+caddy_config/
+caddy_data/
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,21 @@
-FROM python:3.9
+FROM python:3.9.20
 
 RUN apt-get update && apt-get install -y gcc build-essential && rm -rf /var/lib/apt/lists/*
 
 ENV PYTHONUNBUFFERED 1
 
-
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
 # Poetry location so future commands (below) work
+
 ENV PATH $PATH:/root/.local/bin
 # Want poetry to use system python of docker container
 RUN poetry config virtualenvs.create false
 RUN poetry config virtualenvs.in-project false
 
-COPY pyproject.toml ./
-COPY poetry.lock ./
+COPY pyproject.toml poetry.lock ./
+
+# Install dependencies
+RUN poetry install 
 
-RUN poetry install
 
 WORKDIR /app
diff --git a/Dockerfile.compute_worker b/Dockerfile.compute_worker
@@ -7,7 +7,7 @@ ENV PYTHONUNBUFFERED 1
 RUN apt-get update && curl -fsSL https://get.docker.com | sh
 
 
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
 # Poetry location so future commands (below) work
 ENV PATH $PATH:/root/.local/bin
 # Want poetry to use system python of docker container

diff --git a/Dockerfile.compute_worker_gpu b/Dockerfile.compute_worker_gpu
@@ -19,7 +19,7 @@ RUN apt-get install -y nvidia-container-toolkit
 # BB - not convinced we need this
 ENV USE_GPU 1
 
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
 # Poetry location so future commands (below) work
 ENV PATH $PATH:/root/.local/bin
 # Want poetry to use system python of docker container

diff --git a/Dockerfile.flower b/Dockerfile.flower
@@ -1,11 +1,15 @@
-FROM python:3.9-alpine
+FROM python:3.9
+
+# PYTHONUNBUFFERED: Force stdin, stdout and stderr to be totally unbuffered. (equivalent to `python -u`)
+# PYTHONHASHSEED: Enable hash randomization (equivalent to `python -R`)
+# PYTHONDONTWRITEBYTECODE: Do not write byte files to disk, since we maintain it as readonly. (equivalent to `python -B`)
+ENV PYTHONUNBUFFERED=1 PYTHONHASHSEED=random PYTHONDONTWRITEBYTECODE=1
 
 # Get latest root certificates
-RUN apk add --no-cache ca-certificates && update-ca-certificates curl
-RUN apk add curl
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
 
 # # Install the required packages
-RUN curl -sSL https://install.python-poetry.org | python3 -
+RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3
 # Poetry location so future commands (below) work
 ENV PATH $PATH:/root/.local/bin
 # Want poetry to use system python of docker container
@@ -18,13 +22,6 @@ RUN poetry add redis=3.0.1
 RUN poetry add flower=0.9.3
 RUN poetry add celery="<5.0.0"
 
-# PYTHONUNBUFFERED: Force stdin, stdout and stderr to be totally unbuffered. (equivalent to `python -u`)
-# PYTHONHASHSEED: Enable hash randomization (equivalent to `python -R`)
-# PYTHONDONTWRITEBYTECODE: Do not write byte files to disk, since we maintain it as readonly. (equivalent to `python -B`)
-
-
-ENV PYTHONUNBUFFERED=1 PYTHONHASHSEED=random PYTHONDONTWRITEBYTECODE=1
-
 # Default port
 EXPOSE 5555
 

diff --git a/Dockerfile.rabbitmq b/Dockerfile.rabbitmq
@@ -1,3 +1,3 @@
-FROM rabbitmq:management
+FROM rabbitmq:3.13.7-management
 ARG WORKER_CONNECTION_TIMEOUT
 RUN echo "consumer_timeout = $WORKER_CONNECTION_TIMEOUT" >> /etc/rabbitmq/conf.d/10-defaults.conf
diff --git a/README.md b/README.md
@@ -20,10 +20,10 @@ If you wish to configure your own instance of Codabench platform, here are the i
 
 ```
 $ cp .env_sample .env
-$ docker-compose up -d
-$ docker-compose exec django ./manage.py migrate
-$ docker-compose exec django ./manage.py generate_data
-$ docker-compose exec django ./manage.py collectstatic --noinput
+$ docker compose up -d
+$ docker compose exec django ./manage.py migrate
+$ docker compose exec django ./manage.py generate_data
+$ docker compose exec django ./manage.py collectstatic --noinput
 ```
 
 You can now login as username "admin" with password "admin" at http://localhost/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
   django:
     build: .
     # NOTE: We use watchmedo to reload gunicorn nicely, Uvicorn + Gunicorn reloads don't work well
-    command: bash -c "cd /app/src && watchmedo auto-restart -p '*.py' --recursive -- gunicorn asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b :8000 -b :80 --capture-output --log-level debug"
+    command: bash -c "python manage.py collectstatic --noinput && cd /app/src &&  watchmedo auto-restart -p '*.py' --recursive -- gunicorn asgi:application -w 2 -k uvicorn.workers.UvicornWorker -b :8000 -b :80 --capture-output --log-level debug"
     environment:
       - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}
     env_file: .env