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

…DS-894 (eduNEXT#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

tutorcodejail/patches/local-docker-compose-dev-services

@@ -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

tutorcodejail/patches/local-docker-compose-services

@@ -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 }}

tutorcodejail/templates/codejail/apps/config/tutor.py

@@ -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)}}