Merge remote-tracking branch 'origin/master' into nightly

README.rst

@@ -258,6 +258,34 @@ In both cases above, the ``npm`` commands affect every MFE being built.  If you
         ]
     )
 
+In case you need to run additional instructions just before the build step you can use the ``mfe-dockerfile-pre-npm-build`` or ``mfe-dockerfile-pre-npm-build-*`` patches. For example, you may want to override existing env variables or define new ones.
+::
+
+    from tutor import hooks
+
+    hooks.Filters.ENV_PATCHES.add_items(
+        [
+            (
+                "mfe-dockerfile-pre-npm-build",
+                """
+    ENV ENABLE_NEW_RELIC=true
+    ENV NEW_RELIC_ACCOUNT_ID="111111"
+    ENV NEW_RELIC_AGENT_ID="2222222222"
+    ENV NEW_RELIC_TRUST_KEY="333333"
+    ENV NEW_RELIC_LICENSE_KEY="4444444444"
+    ENV NEW_RELIC_APP_ID="5555555555"
+    """
+            ),
+            # Only for the learning MFE
+            (
+                "mfe-dockerfile-pre-npm-build-learning",
+                """ENV CUSTOM_VAR="custom-value"
+                """
+            ),
+        ]
+    )
+
+
 
 Installing from a private npm registry
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

changelog.d/20230828_101247_moises.gonzalez_pre_build_patch.md

@@ -0,0 +1,14 @@
+
+<!--
+Create a changelog entry for every new user-facing change. Please respect the following instructions:
+- Indicate breaking changes by prepending an explosion 💥 character.
+- Prefix your changes with either [Bugfix], [Improvement], [Feature], [Security], [Deprecation].
+- You may optionally append "(by @<author>)" at the end of the line, where "<author>" is either one (just one)
+of your GitHub username, real name or affiliated organization. These affiliations will be displayed in
+the release notes for every release.
+-->
+
+<!-- - 💥[Feature] Foobarize the blorginator. This breaks plugins by renaming the `FOO_DO` filter to `BAR_DO`. (by @regisb) -->
+<!-- - [Improvement] This is a non-breaking change. Life is good. (by @billgates) -->
+
+- [Improvement] Include additional patches in the Dockerfile to add instructions just before the build step. (by @MoisesGSalas)

tutormfe/templates/mfe/build/mfe/Dockerfile

@@ -78,6 +78,8 @@ ENV PUBLIC_PATH='/{{ app_name }}/'
 # So we point to a relative url that will be a proxy for the LMS.
 ENV MFE_CONFIG_API_URL=/api/mfe_config/v1
 ARG ENABLE_NEW_RELIC=false
+{{ patch("mfe-dockerfile-pre-npm-build") }}
+{{ patch("mfe-dockerfile-pre-npm-build-{}".format(app_name)) }}
 
 ######## {{ app_name }} (dev)
 FROM {{ app_name }}-common AS {{ app_name }}-dev