From a97a7b0abdb1ae73df2f0769a2609e6767b40075 Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali <40599381+DawoudSheraz@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:39:41 +0500 Subject: [PATCH] refactor: move uswgi out of platform directory (#1036) --- tutor/templates/build/openedx/Dockerfile | 4 ++-- tutor/templates/k8s/deployments.yml | 4 ++-- tutor/templates/local/docker-compose.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index f89277b..2e42570 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -301,10 +301,10 @@ FROM production AS final ENV UWSGI_WORKERS=2 # Copy the default uWSGI configuration -COPY --chown=app:app settings/uwsgi.ini . +COPY --chown=app:app settings/uwsgi.ini /openedx # Run server -CMD ["uwsgi", "uwsgi.ini"] +CMD ["uwsgi", "/openedx/uwsgi.ini"] {{ patch("openedx-dockerfile-final") }} diff --git a/tutor/templates/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml index 778118b..bf50b48 100644 --- a/tutor/templates/k8s/deployments.yml +++ b/tutor/templates/k8s/deployments.yml @@ -95,7 +95,7 @@ spec: name: settings-cms - mountPath: /openedx/config name: config - - mountPath: /openedx/edx-platform/uwsgi.ini + - mountPath: /openedx/uwsgi.ini name: uwsgi-config subPath: uwsgi.ini resources: @@ -204,7 +204,7 @@ spec: name: settings-cms - mountPath: /openedx/config name: config - - mountPath: /openedx/edx-platform/uwsgi.ini + - mountPath: /openedx/uwsgi.ini name: uwsgi-config subPath: uwsgi.ini resources: diff --git a/tutor/templates/local/docker-compose.yml b/tutor/templates/local/docker-compose.yml index 14e1414..63c2d3c 100644 --- a/tutor/templates/local/docker-compose.yml +++ b/tutor/templates/local/docker-compose.yml @@ -109,7 +109,7 @@ services: - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro - ../apps/openedx/config:/openedx/config:ro - - ../apps/openedx/uwsgi.ini:/openedx/edx-platform/uwsgi.ini:ro + - ../apps/openedx/uwsgi.ini:/openedx/uwsgi.ini:ro - ../../data/lms:/openedx/data - ../../data/openedx-media:/openedx/media {%- for mount in iter_mounts(MOUNTS, "openedx", "lms") %} @@ -135,7 +135,7 @@ services: - ../apps/openedx/settings/lms:/openedx/edx-platform/lms/envs/tutor:ro - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:ro - ../apps/openedx/config:/openedx/config:ro - - ../apps/openedx/uwsgi.ini:/openedx/edx-platform/uwsgi.ini:ro + - ../apps/openedx/uwsgi.ini:/openedx/uwsgi.ini:ro - ../../data/cms:/openedx/data - ../../data/openedx-media:/openedx/media {%- for mount in iter_mounts(MOUNTS, "openedx", "cms") %}