Skip to content

Commit ec3bd77

Browse files
authored
feat: Add codejail service (#102)
This is part of edx/edx-arch-experiments#894
1 parent 72d3b2a commit ec3bd77

File tree

6 files changed

+25
-1
lines changed

6 files changed

+25
-1
lines changed

docker-compose-host.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ services:
6161
cms-worker:
6262
volumes:
6363
- ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform
64+
codejail:
65+
volumes:
66+
- ${DEVSTACK_WORKSPACE}/codejail-service:/app
67+
- ${DEVSTACK_WORKSPACE}/src:/edx/src
68+
- ${PWD}/py_configuration_files/codejail.py:/app/codejail_service/settings/devstack.py
6469
insights:
6570
volumes:
6671
- ${DEVSTACK_WORKSPACE}/edx-analytics-dashboard:/edx/app/insights/insights

docker-compose.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,17 @@ services:
657657
# Dangerous to run Celery as root normally, but it's how we do things in devstack for some reason
658658
C_FORCE_ROOT: "true"
659659

660+
codejail:
661+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.codejail"
662+
hostname: codejail.devstack.edx
663+
stdin_open: true
664+
tty: true
665+
image: edxops/codejail-dev:latest
666+
environment:
667+
DJANGO_SETTINGS_MODULE: codejail_service.settings.devstack
668+
ports:
669+
- "18030:8080"
670+
660671
xqueue:
661672
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.xqueue"
662673
image: edxops/xqueue-dev:latest

docs/service_list.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
4141
+------------------------------------+-------------------------------------+----------------+--------------+
4242
| `frontend-app-authn`_ | http://localhost:1999/ | MFE (React.js) | Default |
4343
+------------------------------------+-------------------------------------+----------------+--------------+
44+
| `codejail`_ | http://localhost:18030/ | Python/Django | Extra |
45+
+------------------------------------+-------------------------------------+----------------+--------------+
4446
| `registrar`_ | http://localhost:18734/api-docs/ | Python/Django | Extra |
4547
+------------------------------------+-------------------------------------+----------------+--------------+
4648
| `frontend-app-program-console`_ | http://localhost:1976/ | MFE (React.js) | Extra |
@@ -84,6 +86,7 @@ Some common service combinations include:
8486
.. _frontend-app-gradebook: https://github.com/openedx/frontend-app-gradebook
8587
.. _lms: https://github.com/openedx/edx-platform
8688
.. _frontend-app-program-console: https://github.com/edx/frontend-app-program-console
89+
.. _codejail: https://github.com/openedx/codejail-service
8790
.. _registrar: https://github.com/edx/registrar
8891
.. _cms: https://github.com/openedx/edx-platform
8992
.. _frontend-app-learner-dashboard: https://github.com/openedx/frontend-app-learner-dashboard

options.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-authn+frontend-
6767
# Separated by plus signs.
6868
# Separated by plus signs. Listed in alphabetical order for clarity.
6969
EDX_SERVICES ?= \
70-
analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise-catalog+license-manager
70+
analyticsapi+codejail+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise-catalog+license-manager
7171

7272
# Services with database migrations.
7373
# Should be a subset of $(EDX_SERVICES).

py_configuration_files/codejail.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"""Settings for devstack use."""
2+
3+
from codejail_service.settings.local import * # pylint: disable=wildcard-import

repo.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ repos=(
3838
"https://github.com/edx/edx-analytics-data-api.git"
3939
"https://github.com/openedx/enterprise-catalog.git"
4040
"https://github.com/openedx/license-manager.git"
41+
"https://github.com/openedx/codejail-service.git"
4142
)
4243

4344
non_release_repos=(
@@ -70,6 +71,7 @@ ssh_repos=(
7071
"[email protected]:edx/edx-analytics-dashboard.git"
7172
"[email protected]:edx/edx-analytics-data-api.git"
7273
"[email protected]:openedx/license-manager.git"
74+
"[email protected]:openedx/codejail-service.git"
7375
)
7476

7577
non_release_ssh_repos=(

0 commit comments

Comments
 (0)