From a5d726bf74b706d2f5ad46bf348d01b80994310a Mon Sep 17 00:00:00 2001 From: Hunia Fatima Date: Wed, 13 Nov 2024 00:16:58 +0500 Subject: [PATCH] chore: pull devstack.py file from updated reference chore: revert testing branch name in curl statement --- dockerfiles/course-discovery.Dockerfile | 2 ++ dockerfiles/credentials.Dockerfile | 3 +++ dockerfiles/ecommerce.Dockerfile | 4 ++++ dockerfiles/edx-analytics-dashboard.Dockerfile | 2 ++ dockerfiles/edx-analytics-data-api.Dockerfile | 4 +++- dockerfiles/edx-notes-api.Dockerfile | 4 +++- dockerfiles/registrar.Dockerfile | 4 +++- dockerfiles/xqueue.Dockerfile | 4 +++- 8 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dockerfiles/course-discovery.Dockerfile b/dockerfiles/course-discovery.Dockerfile index fc4725b..6619755 100644 --- a/dockerfiles/course-discovery.Dockerfile +++ b/dockerfiles/course-discovery.Dockerfile @@ -87,6 +87,8 @@ CMD gunicorn --bind=0.0.0.0:8381 --workers 2 --max-requests=1000 -c course_disco FROM app AS dev +RUN curl -L -o ${DISCOVERY_CODE_DIR}/course_discovery/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/course-discovery.py + ENV DJANGO_SETTINGS_MODULE "course_discovery.settings.devstack" RUN pip install -r ${DISCOVERY_CODE_DIR}/requirements/django.txt diff --git a/dockerfiles/credentials.Dockerfile b/dockerfiles/credentials.Dockerfile index 3f78a4e..e60e145 100644 --- a/dockerfiles/credentials.Dockerfile +++ b/dockerfiles/credentials.Dockerfile @@ -96,6 +96,9 @@ CMD gunicorn --workers=2 --name credentials -c /edx/app/credentials/credentials/ # able to update requirements and generally run things as root. FROM base AS dev USER root + +RUN curl -L -o credentials/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/master/py_configuration_files/credentials.py + ENV DJANGO_SETTINGS_MODULE credentials.settings.devstack RUN pip install -r /edx/app/credentials/credentials/requirements/dev.txt RUN make pull_translations diff --git a/dockerfiles/ecommerce.Dockerfile b/dockerfiles/ecommerce.Dockerfile index 3e6a571..c037154 100644 --- a/dockerfiles/ecommerce.Dockerfile +++ b/dockerfiles/ecommerce.Dockerfile @@ -69,6 +69,8 @@ RUN pip install -r ${ECOMMERCE_CODE_DIR}/requirements/production.txt # every time any bit of code is changed. RUN curl -L https://github.com/edx/ecommerce/archive/refs/heads/2u/main.tar.gz | tar -xz --strip-components=1 +RUN rm ${ECOMMERCE_CODE_DIR}/ecommerce/settings/devstack.py + CMD gunicorn --bind=0.0.0.0:18130 --workers 2 --max-requests=1000 -c ecommerce/docker_gunicorn_configuration.py ecommerce.wsgi:application FROM app AS dev @@ -88,4 +90,6 @@ RUN touch ${ECOMMERCE_APP_DIR}/ecommerce_env # every time any bit of code is changed. RUN curl -L https://github.com/openedx/ecommerce/archive/refs/heads/2u/main.tar.gz | tar -xz --strip-components=1 +RUN curl -L -o ${ECOMMERCE_CODE_DIR}/ecommerce/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/ecommerce.py + CMD while true; do python ./manage.py runserver 0.0.0.0:18130; sleep 2; done diff --git a/dockerfiles/edx-analytics-dashboard.Dockerfile b/dockerfiles/edx-analytics-dashboard.Dockerfile index da92fac..8c54eb0 100644 --- a/dockerfiles/edx-analytics-dashboard.Dockerfile +++ b/dockerfiles/edx-analytics-dashboard.Dockerfile @@ -67,6 +67,8 @@ RUN pip install --no-cache-dir -r requirements/production.txt RUN curl -L https://github.com/edx/edx-analytics-dashboard/archive/refs/heads/master.tar.gz | tar -xz --strip-components=1 +RUN curl -L -o ${INSIGHTS_CODE_DIR}/analytics_dashboard/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/course-discovery.py + RUN nodeenv ${INSIGHTS_NODEENV_DIR} --node=18.20.2 --prebuilt \ && npm install -g npm@10.5.x diff --git a/dockerfiles/edx-analytics-data-api.Dockerfile b/dockerfiles/edx-analytics-data-api.Dockerfile index 63937c2..9642d9c 100644 --- a/dockerfiles/edx-analytics-data-api.Dockerfile +++ b/dockerfiles/edx-analytics-data-api.Dockerfile @@ -87,7 +87,9 @@ CMD ["gunicorn" , "-b", "0.0.0.0:8100", "--pythonpath", "/edx/app/analytics_api/ FROM base AS dev -ENV DJANGO_SETTINGS_MODULE="analyticsdataserver.settings.devstack" +RUN curl -L -o ${ANALYTICS_API_CODE_DIR}/analyticsdataserver/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/analytics_data_api.py + +ENV DJANGO_SETTINGS_MODULE "analyticsdataserver.settings.devstack" RUN curl -L -o requirements/dev.txt https://raw.githubusercontent.com/edx/edx-analytics-data-api/master/requirements/dev.txt diff --git a/dockerfiles/edx-notes-api.Dockerfile b/dockerfiles/edx-notes-api.Dockerfile index d42b26b..3cef360 100644 --- a/dockerfiles/edx-notes-api.Dockerfile +++ b/dockerfiles/edx-notes-api.Dockerfile @@ -91,7 +91,9 @@ EXPOSE 8120 FROM app AS dev -ENV DJANGO_SETTINGS_MODULE="notesserver.settings.devstack" +RUN curl -L -o ${NOTES_VENV_DIR}/notesserver/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/edx_notes_api.py + +ENV DJANGO_SETTINGS_MODULE "notesserver.settings.devstack" # Backwards compatibility with devstack RUN touch "${COMMON_APP_DIR}/edx_notes_api_env" diff --git a/dockerfiles/registrar.Dockerfile b/dockerfiles/registrar.Dockerfile index 22b4dde..e92102d 100644 --- a/dockerfiles/registrar.Dockerfile +++ b/dockerfiles/registrar.Dockerfile @@ -83,7 +83,9 @@ RUN pip install --no-cache-dir -r ${REGISTRAR_CODE_DIR}/requirements/devstack.tx # cloning the repository after requirements installation RUN curl -L https://github.com/edx/registrar/archive/refs/heads/master.tar.gz | tar -xz --strip-components=1 -ENV DJANGO_SETTINGS_MODULE=registrar.settings.devstack +RUN curl -L -o ${REGISTRAR_CODE_DIR}/registrar/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/registrar.py + +ENV DJANGO_SETTINGS_MODULE registrar.settings.devstack CMD while true; do python ./manage.py runserver 0.0.0.0:18734; sleep 2; done diff --git a/dockerfiles/xqueue.Dockerfile b/dockerfiles/xqueue.Dockerfile index 3d0e2a4..45f1d72 100644 --- a/dockerfiles/xqueue.Dockerfile +++ b/dockerfiles/xqueue.Dockerfile @@ -46,7 +46,9 @@ RUN pip install -r ${XQUEUE_CODE_DIR}/requirements/dev.txt # cloning git repo RUN curl -L https://github.com/openedx/xqueue/archive/refs/heads/master.tar.gz | tar -xz --strip-components=1 -ENV DJANGO_SETTINGS_MODULE=xqueue.devstack +RUN curl -L -o ${XQUEUE_CODE_DIR}/xqueue/devstack.py https://raw.githubusercontent.com/edx/devstack/main/py_configuration_files/xqueue.py + +ENV DJANGO_SETTINGS_MODULE xqueue.devstack CMD while true; do python ./manage.py runserver 0.0.0.0:8040; sleep 2; done