mfe checkpoint

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

@@ -1,17 +1,28 @@
-# MFE apps
-{% for app_name, app in iter_mfes() %}
-{{ app_name }}:
-    image: "{{ DOCKER_REGISTRY }}overhangio/openedx-{{ app_name }}-dev:{{ MFE_VERSION }}"
-    ports:
-        - "{{ app["port"] }}:{{ app["port"] }}"
-    stdin_open: true
-    tty: true
-    volumes:
-        - ../plugins/mfe/apps/mfe/webpack.dev-tutor.config.js:/openedx/app/webpack.dev-tutor.config.js:ro
-        {%- for mount in iter_mounts(MOUNTS, app_name) %}
-        - {{ mount }}
-        {%- endfor %}
+# Web proxy for load balancing and SSL termination
+caddy:
+  image: {{ DOCKER_IMAGE_CADDY }}
+  restart: unless-stopped
+  ports:
+    - "{{ CADDY_HTTP_PORT }}:80"
+    {% if ENABLE_HTTPS and ENABLE_WEB_PROXY %}- "443:443"{% endif %}
+  environment:
+    default_site_port: "{% if not ENABLE_HTTPS or not ENABLE_WEB_PROXY %}:80{% endif %}"
+  volumes:
+    - ../apps/caddy/Caddyfile:/etc/caddy/Caddyfile:ro
+    {% if ENABLE_HTTPS and ENABLE_WEB_PROXY %}- ../../data/caddy:/data{% endif %}
+  {% if not ENABLE_HTTPS %}
+  networks:
+    default:
+      # These aliases are for internal communication between containers when running locally
+      # with *.local.overhang.io hostnames.
+      aliases:
+        - "{{ LMS_HOST }}"
+        {{ patch("local-docker-compose-caddy-aliases")|indent(10) }}
+  {% endif %}
+mfe:
+    image: {{ MFE_DOCKER_IMAGE }}
     restart: unless-stopped
+    volumes:
+        - ../plugins/mfe/apps/mfe/Caddyfile:/etc/caddy/Caddyfile:ro
     depends_on:
         - lms
-{% endfor %}

tutormfe/patches/openedx-cms-development-settings

@@ -1,9 +1,16 @@
 # MFE-specific settings
 {% for app_name, app in iter_mfes() %}
 {% if app_name == "course-authoring" %}
-COURSE_AUTHORING_MICROFRONTEND_URL = "http://{{ MFE_HOST }}:{{ app["port"] }}/course-authoring"
-CORS_ORIGIN_WHITELIST.append("http://{{ MFE_HOST }}:{{ app["port"] }}")
+COURSE_AUTHORING_MICROFRONTEND_URL = "{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ MFE_HOST }}:{{ app["port"] }}/course-authoring"
+CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ MFE_HOST }}:{{ app["port"] }}")
 LOGIN_REDIRECT_WHITELIST.append("{{ MFE_HOST }}:{{ app["port"] }}")
 CSRF_TRUSTED_ORIGINS.append("{{ MFE_HOST }}:{{ app["port"] }}")
 {% endif %}
+CORS_ORIGIN_WHITELIST.append("http://local.overhang.io:{{ app["port"] }}")
+LOGIN_REDIRECT_WHITELIST.append("local.overhang.io:{{ app["port"] }}")
+CSRF_TRUSTED_ORIGINS.append("local.overhang.io:{{ app["port"] }}")
 {% endfor %}
+
+LOGIN_REDIRECT_WHITELIST.append("{{ MFE_HOST }}")
+CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ MFE_HOST }}")
+CSRF_TRUSTED_ORIGINS.append("{{ MFE_HOST }}")

tutormfe/patches/openedx-lms-development-settings

@@ -24,8 +24,8 @@ MFE_CONFIG = {
 # MFE-specific settings
 {% for app_name, app in iter_mfes() %}
 {% if app_name == "authn" %}
-AUTHN_MICROFRONTEND_URL = "http://{{ MFE_HOST }}:{{ app["port"] }}/authn"
-AUTHN_MICROFRONTEND_DOMAIN  = "{{ MFE_HOST }}/authn"
+AUTHN_MICROFRONTEND_URL = "http://local.overhang.io:1999"
+AUTHN_MICROFRONTEND_DOMAIN = "local.overhang.io:1999"
 MFE_CONFIG["DISABLE_ENTERPRISE_LOGIN"] = True
 {% elif app_name == "account" %}
 ACCOUNT_MICROFRONTEND_URL = "http://{{ MFE_HOST }}:{{ app["port"] }}/account"
@@ -58,7 +58,10 @@ MFE_CONFIG["SCHEDULE_EMAIL_SECTION"] = True
 CORS_ORIGIN_WHITELIST.append("http://{{ MFE_HOST }}:{{ app["port"] }}")
 LOGIN_REDIRECT_WHITELIST.append("{{ MFE_HOST }}:{{ app["port"] }}")
 CSRF_TRUSTED_ORIGINS.append("{{ MFE_HOST }}:{{ app["port"] }}")
+CORS_ORIGIN_WHITELIST.append("http://local.overhang.io:{{ app["port"] }}")
+LOGIN_REDIRECT_WHITELIST.append("local.overhang.io:{{ app["port"] }}")
+CSRF_TRUSTED_ORIGINS.append("local.overhang.io:{{ app["port"] }}")
 {% endfor %}
 
-{{ patch("mfe-lms-common-settings") }}
-{{ patch("mfe-lms-development-settings") }}
+LOGIN_REDIRECT_WHITELIST.append("{{ MFE_HOST }}")
+CORS_ORIGIN_WHITELIST.append("{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ MFE_HOST }}")

tutormfe/plugin.py

@@ -126,23 +126,6 @@ def is_mfe_enabled(mfe_name: str) -> bool:
     )
 )
 
-
-# Build, pull and push {mfe}-dev images
-for mfe_name, mfe_attrs in iter_mfes():
-    name = f"{mfe_name}-dev"
-    tag = "{{ DOCKER_REGISTRY }}overhangio/openedx-" + name + ":{{ MFE_VERSION }}"
-    tutor_hooks.Filters.IMAGES_BUILD.add_item(
-        (
-            name,
-            os.path.join("plugins", "mfe", "build", "mfe"),
-            tag,
-            (f"--target={mfe_name}-dev",),
-        )
-    )
-    tutor_hooks.Filters.IMAGES_PULL.add_item((name, tag))
-    tutor_hooks.Filters.IMAGES_PUSH.add_item((name, tag))
-
-
 # init script
 with open(
     os.path.join(