diff --git a/tutorecommerce/plugin.py b/tutorecommerce/plugin.py index 5c864724..d23d99cc 100644 --- a/tutorecommerce/plugin.py +++ b/tutorecommerce/plugin.py @@ -79,6 +79,7 @@ }, }, }, + "ATLAS_PULL": False, }, } diff --git a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile index b7d25add..2f9974d2 100644 --- a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile +++ b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile @@ -2,15 +2,16 @@ ###### Minimal image with base system requirements for most stages FROM docker.io/ubuntu:20.04 as minimal +ENV DEBIAN_FRONTEND=noninteractive RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked{% endif %} \ apt update && \ - apt install -y curl git-core language-pack-en + apt install -y curl gettext git-core language-pack-en ###### Checkout code FROM minimal as checkout -ARG ECOMMERCE_REPOSITORY=https://github.com/edx/ecommerce.git +ARG ECOMMERCE_REPOSITORY=https://github.com/openedx/ecommerce.git ARG ECOMMERCE_VERSION='{{ OPENEDX_COMMON_VERSION }}' RUN mkdir -p /openedx/ecommerce && \ git clone $ECOMMERCE_REPOSITORY --branch $ECOMMERCE_VERSION --depth 1 /openedx/ecommerce @@ -79,6 +80,12 @@ 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 %} +{% if ECOMMERCE_ATLAS_PULL %} +# Pull translations. Support the OEP-58 proposal behind a feature flag until it's fully implemented. +RUN atlas pull {{ patch("atlas-extra-args") }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale +RUN python manage.py compilemessages +{% endif %} + # Collect static assets (aka: "make static") COPY --chown=app:app assets.py ./ecommerce/settings/assets.py ENV DJANGO_SETTINGS_MODULE ecommerce.settings.assets