tutor/tutor-discovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add minimal atlas step to the build

Browse Source 
This contribution is part of the [FC-0012 project](https://openedx.atlassian.net/l/cp/XGS0iCcQ) which is sparked by the [Translation Infrastructure update OEP-58](https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification).
This commit is contained in:
Omar Al-Ithawi 2023-08-02 09:07:00 +03:00 committed by Régis Behmo
parent 1667af12cb
commit b9dd940903
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20230909_160414_i_atlas.md Normal file
View File

@ -0,0 +1 @@
- [Feature] Pull translations via `atlas` during Docker build. (by @OmarIthawi)

1
tutordiscovery/plugin.py
View File

@ -31,6 +31,7 @@ config = {
"OAUTH2_KEY_SSO": "discovery-sso", "OAUTH2_KEY_SSO": "discovery-sso",
"OAUTH2_KEY_SSO_DEV": "discovery-sso-dev", "OAUTH2_KEY_SSO_DEV": "discovery-sso-dev",
"CACHE_REDIS_DB": "{{ OPENEDX_CACHE_REDIS_DB }}", "CACHE_REDIS_DB": "{{ OPENEDX_CACHE_REDIS_DB }}",
"ATLAS_PULL": False,
"EXTRA_PIP_REQUIREMENTS": [], "EXTRA_PIP_REQUIREMENTS": [],
}, },
} }

12
tutordiscovery/templates/discovery/build/discovery/Dockerfile
View File

@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked{% endif %} \ --mount=type=cache,target=/var/lib/apt,sharing=locked{% endif %} \
apt update && \ apt update && \
apt install -y curl git-core language-pack-en python3 python3-dev python3-pip python3-venv \ apt install -y curl git-core gettext language-pack-en python3 python3-dev python3-pip python3-venv \
build-essential libcairo2 libffi-dev libmysqlclient-dev libxml2-dev libxslt-dev libjpeg-dev libssl-dev \ build-essential libcairo2 libffi-dev libmysqlclient-dev libxml2-dev libxslt-dev libjpeg-dev libssl-dev \
pkg-config pkg-config
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
@ -61,7 +61,15 @@ RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/openedx/.cache/pip,
# Use redis as a django cache https://pypi.org/project/django-redis/ # Use redis as a django cache https://pypi.org/project/django-redis/
django-redis==5.2.0 \ django-redis==5.2.0 \
# uwsgi server https://pypi.org/project/uWSGI/ # uwsgi server https://pypi.org/project/uWSGI/
uwsgi==2.0.21 uwsgi==2.0.21 \
# Open edX Atlas tranlsation management tool https://pypi.org/project/openedx-atlas/
openedx-atlas==0.5.0
{% if DISCOVERY_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/course-discovery/course_discovery/conf/locale:course_discovery/conf/locale
RUN python manage.py compilemessages
{% endif %}
# Collect static assets # Collect static assets
COPY --chown=app:app assets.py ./course_discovery/settings/assets.py COPY --chown=app:app assets.py ./course_discovery/settings/assets.py