Skip to content

Commit

Permalink
fix: use dev image for tutor dev do, not prod image
Browse files Browse the repository at this point in the history
The lms-job and cms-job services were configured to use
{{ DOCKER_IMAGE_OPENEDX }} rather than {{ DOCKER_IMAGE_OPENEDX_DEV }}.

This means that when running jobs in dev mode, a la:

    tutor dev do init

a production image would be used, to the user's surprise.
  • Loading branch information
kdmccormick authored and regisb committed Mar 14, 2023
1 parent 80b4820 commit 732e0c4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md
Original file line number Diff line number Diff line change
@@ -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 changes: 20 additions & 2 deletions tutor/templates/dev/docker-compose.jobs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
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) }}

0 comments on commit 732e0c4

Please sign in to comment.