Skip to content

Commit 45b1ec7

Browse files
committed
rebase feature branch on dev
1 parent 274d7ac commit 45b1ec7

67 files changed

Lines changed: 608 additions & 1227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 4
7+
indent_style = space
8+
insert_final_newline = true
9+
tab_width = 4
10+
trim_trailing_whitespace = true
11+
12+
[*.{yml,yaml}]
13+
indent_size = 2
14+
tab_width = 2
15+
16+
[*.md]
17+
trim_trailing_whitespace = false

.env_circleci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ WORKER_CONNECTION_TIMEOUT=100000000 # milliseconds
1414

1515
FLOWER_BASIC_AUTH=root:password-you-should-change
1616

17+
SELENIUM_HOSTNAME=selenium
18+
1719
DJANGO_SETTINGS_MODULE=settings.test
1820

1921
# Minio local storage example

.env_sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ SELENIUM_HOSTNAME=selenium
4545
#EMAIL_HOST_PASSWORD=pass
4646
#EMAIL_PORT=587
4747
#EMAIL_USE_TLS=True
48+
#DEFAULT_FROM_EMAIL="Codabench <noreply@example.com>"
4849
#SERVER_EMAIL=noreply@example.com
4950

5051
# Contact Email

Procfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
web: cd src && gunicorn asgi:application -w 3 -k uvicorn.workers.UvicornWorker -b :$PORT --max-requests 1024 --max-requests-jitter 256
2+
worker: cd src && celery -A celery_config worker -B -Q site-worker -l info -n site-worker@%n --concurrency=3

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ $ docker compose exec django ./manage.py collectstatic --noinput
2929

3030
You can now login as username "admin" with password "admin" at http://localhost/
3131

32+
If you ever need to reset the database, use the script `./reset_db.sh`
33+
3234
For more information about installation, checkout [Codabench Basic Installation Guide](https://docs.codabench.org/latest/Developers_and_Administrators/Codabench-Installation/) and [How to Deploy Server](https://docs.codabench.org/latest/Developers_and_Administrators/How-to-deploy-Codabench-on-your-server/).
3335

3436

app.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"name": "competitions-v2",
3+
"scripts": {
4+
"postdeploy": "bin/init_staging"
5+
},
6+
"env": {
7+
"USE_SSL": "True",
8+
"GUNICORN_CMD_ARGS": "--workers=3",
9+
"DJANGO_SETTINGS_MODULE": "settings.develop",
10+
"TEMP_SUBMISSION_STORAGE": "./temp_submission_storage/",
11+
"AWS_ACCESS_KEY_ID": {"required": true},
12+
"AWS_SECRET_ACCESS_KEY": {"required": true},
13+
"AWS_S3_ENDPOINT_URL": {"required": true},
14+
"AWS_STORAGE_BUCKET_NAME": {"required": true},
15+
"AWS_STORAGE_PRIVATE_BUCKET_NAME": {"required": true}
16+
},
17+
"formation": {
18+
"web": {
19+
"quantity": 1,
20+
"size": "free"
21+
},
22+
"worker": {
23+
"quantity": 1,
24+
"size": "free"
25+
}
26+
},
27+
"addons": [
28+
"heroku-postgresql",
29+
"heroku-redis",
30+
"searchbox:starter",
31+
"cloudamqp:lemur"
32+
],
33+
"buildpacks": [
34+
{
35+
"url": "heroku/nodejs"
36+
},
37+
{
38+
"url": "heroku/python"
39+
}
40+
41+
]
42+
}

certs/.gitkeep

Whitespace-only changes.

conftest.py

Whitespace-only changes.

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: '3'
12
services:
23
#----------------------------------------------------------------------------------------------------
34
# Web Services

documentation/ABOUT.md

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)