Skip to content

Commit

Permalink
fix: use tutor config on codejail service and add patches to edit it …
Browse files Browse the repository at this point in the history
…DS-894 (#55)

* fix: use tutor config on codejail service and add patches to edit it

* fix: use the right settings for each environment

* fix: add code_jail to be able to edit it trough patches

* fix: add indent to the patches
  • Loading branch information
MaferMazu committed May 24, 2024
1 parent e9d7710 commit 03111d1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tutorcodejail/patches/local-docker-compose-dev-services
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
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
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)}}

0 comments on commit 03111d1

Please sign in to comment.