Skip to content

fix: use tutor config on codejail service and add patches to edit it DS-894 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaferMazu merged 4 commits into from
May 24, 2024
Merged

fix: use tutor config on codejail service and add patches to edit it DS-894 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5693dac
fix: use tutor config on codejail service and add patches to edit it
MaferMazu May 16, 2024
091e3f7
fix: use the right settings for each environment
MaferMazu May 21, 2024
5c33ccc
fix: add code_jail to be able to edit it trough patches
MaferMazu May 22, 2024
794acfa
fix: add indent to the patches
MaferMazu May 23, 2024
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
4 changes: 2 additions & 2 deletions tutorcodejail/patches/local-docker-compose-dev-services
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ codejailservice:
command: flask run --host 0.0.0.0 --port 8550
environment:
FLASK_ENV: development
FLASK_APP_SETTINGS: codejailservice.config.DevelopmentConfig
FLASK_APP_SETTINGS: codejailservice.tutor.DevelopmentConfig
ports:
- "8550:8550"
restart: unless-stopped
restart: unless-stopped
2 changes: 1 addition & 1 deletion tutorcodejail/patches/local-docker-compose-services
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
codejailservice:
image: {{ CODEJAIL_DOCKER_IMAGE }}
environment:
FLASK_APP_SETTINGS: codejailservice.config.ProductionConfig
FLASK_APP_SETTINGS: codejailservice.tutor.ProductionConfig
{% if CODEJAIL_ENFORCE_APPARMOR %}
security_opt:
- apparmor:docker-edx-sandbox-{{ CODEJAIL_SANDBOX_PYTHON_VERSION }}
Expand Down
18 changes: 13 additions & 5 deletions tutorcodejail/templates/codejail/apps/config/tutor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
"""Module with the configuration of config classes."""
from base import BaseConfig
from codejailservice.config import DevelopmentConfig, ProductionConfig


class DevConfig(BaseConfig):
"""Class to use for development context that inherits from BaseConfig."""
class DevelopmentConfig(DevelopmentConfig):
"""Class to use for development context that inherits from DevelopmentConfig."""

CODE_JAIL = DevelopmentConfig.CODE_JAIL
{{patch("codejail-common-settings") | indent(4)}}
{{patch("codejail-development-settings") | indent(4)}}

class ProductionConfig(BaseConfig):
"""Class to use for production context that inherits from BaseConfig."""

class ProductionConfig(ProductionConfig):
"""Class to use for production context that inherits from ProductionConfig."""

CODE_JAIL = ProductionConfig.CODE_JAIL
{{patch("codejail-common-settings") | indent(4)}}
{{patch("codejail-production-settings") | indent(4)}}