From 732e0c43be5b801b7c62892bdc9b44bc74b7263f Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Mon, 13 Mar 2023 16:33:39 -0400 Subject: [PATCH] fix: use dev image for `tutor dev do`, not prod image 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. --- ...230313_163654_kdmc_dev_image_for_dev_do.md | 1 + tutor/templates/dev/docker-compose.jobs.yml | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md diff --git a/changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md b/changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md new file mode 100644 index 0000000..c4325e3 --- /dev/null +++ b/changelog.d/20230313_163654_kdmc_dev_image_for_dev_do.md @@ -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) diff --git a/tutor/templates/dev/docker-compose.jobs.yml b/tutor/templates/dev/docker-compose.jobs.yml index 9dfa7c6..efc84dd 100644 --- a/tutor/templates/dev/docker-compose.jobs.yml +++ b/tutor/templates/dev/docker-compose.jobs.yml @@ -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) }}