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

overhangio · Nov 24, 2023 · 1d1a336 · 1d1a336
2 parents a065a93 + a3163ea
commit 1d1a336
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/changelog.d/20231123_114642_ivo.branco.md b/changelog.d/20231123_114642_ivo.branco.md
@@ -0,0 +1 @@
+- [Feature] Add patch ecommerce-dockerfile-pre-assets. (by @igobranco)
diff --git a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile
@@ -79,6 +79,8 @@ RUN cd /openedx/requirements/ \
 {% for extra_requirement in ECOMMERCE_EXTRA_PIP_REQUIREMENTS %}RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,sharing=shared,uid=${APP_USER_ID} {% endif %}pip install '{{ extra_requirement }}'
 {% endfor %}
 
+{{ patch("ecommerce-dockerfile-pre-assets") }}
+
 # Collect static assets (aka: "make static")
 COPY --chown=app:app assets.py ./ecommerce/settings/assets.py
 ENV DJANGO_SETTINGS_MODULE ecommerce.settings.assets
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Feature] Add patch ecommerce-dockerfile-pre-assets. (by @igobranco)