christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-14 06:58:21 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Overhang.IO 2023-03-14 09:04:01 +00:00
commit 540e53eb5f
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md Normal file
View File

@ -0,0 +1 @@
- [Bugfix] Running jobs in development mode with ``tutor dev do ...`` will now correctly use the development image. Previously, it used the production image, just like ``tutor local do ...``. (by @kdmccormick)

22
tutor/templates/dev/docker-compose.jobs.yml
View File

@ -1,3 +1,21 @@
version: "{{ DOCKER_COMPOSE_VERSION }}" version: "{{ DOCKER_COMPOSE_VERSION }}"
services: {% if not patch("dev-docker-compose-jobs-services") %}{}{% endif %}
{{ patch("dev-docker-compose-jobs-services")|indent(4) }} x-openedx-job-service:
&openedx-job-service
image: {{ DOCKER_IMAGE_OPENEDX_DEV }}
build:
context: ../build/openedx/
target: development
args:
# Note that we never build the openedx-dev image with root user ID, as it would simply fail.
APP_USER_ID: "{{ HOST_USER_ID or 1000 }}"
services:
lms-job:
<<: *openedx-job-service
cms-job:
<<: *openedx-job-service
{{ patch("dev-docker-compose-jobs-services")|indent(2) }}