From 71869c9e0062d26c10f5e7a18a0ef5e160efcf1b Mon Sep 17 00:00:00 2001 From: Hunia Fatima Date: Thu, 14 Nov 2024 13:23:39 +0500 Subject: [PATCH] chore: revert testing branch name in curl statement --- dockerfiles/course-discovery.Dockerfile | 2 +- dockerfiles/ecommerce.Dockerfile | 4 +--- dockerfiles/edx-analytics-dashboard.Dockerfile | 2 +- dockerfiles/edx-analytics-data-api.Dockerfile | 2 +- dockerfiles/edx-notes-api.Dockerfile | 2 +- dockerfiles/registrar.Dockerfile | 2 +- dockerfiles/xqueue.Dockerfile | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dockerfiles/course-discovery.Dockerfile b/dockerfiles/course-discovery.Dockerfile index ece4c41..6619755 100644 --- a/dockerfiles/course-discovery.Dockerfile +++ b/dockerfiles/course-discovery.Dockerfile @@ -87,7 +87,7 @@ 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/huniafatima/add-devstack-config/py_configuration_files/course-discovery.py +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" diff --git a/dockerfiles/ecommerce.Dockerfile b/dockerfiles/ecommerce.Dockerfile index 278a498..c037154 100644 --- a/dockerfiles/ecommerce.Dockerfile +++ b/dockerfiles/ecommerce.Dockerfile @@ -75,8 +75,6 @@ CMD gunicorn --bind=0.0.0.0:18130 --workers 2 --max-requests=1000 -c ecommerce/d FROM app AS dev -#RUN curl -L -o ${DISCOVERY_CODE_DIR}/course_discovery/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/huniafatima/add-devstack-config/py_configuration_files/course-discovery.py - ENV DJANGO_SETTINGS_MODULE "ecommerce.settings.devstack" RUN mkdir requirements @@ -92,6 +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/huniafatima/add-devstack-config/py_configuration_files/ecommerce.py +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 fbb5a64..8c54eb0 100644 --- a/dockerfiles/edx-analytics-dashboard.Dockerfile +++ b/dockerfiles/edx-analytics-dashboard.Dockerfile @@ -67,7 +67,7 @@ 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/huniafatima/add-devstack-config/py_configuration_files/course-discovery.py +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 02edd9a..9642d9c 100644 --- a/dockerfiles/edx-analytics-data-api.Dockerfile +++ b/dockerfiles/edx-analytics-data-api.Dockerfile @@ -87,7 +87,7 @@ CMD ["gunicorn" , "-b", "0.0.0.0:8100", "--pythonpath", "/edx/app/analytics_api/ FROM base AS dev -RUN curl -L -o ${ANALYTICS_API_CODE_DIR}/analyticsdataserver/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/huniafatima/add-devstack-config/py_configuration_files/analytics_data_api.py +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" diff --git a/dockerfiles/edx-notes-api.Dockerfile b/dockerfiles/edx-notes-api.Dockerfile index ae0c858..3cef360 100644 --- a/dockerfiles/edx-notes-api.Dockerfile +++ b/dockerfiles/edx-notes-api.Dockerfile @@ -91,7 +91,7 @@ EXPOSE 8120 FROM app AS dev -RUN curl -L -o ${NOTES_VENV_DIR}/notesserver/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/huniafatima/add-devstack-config/py_configuration_files/edx_notes_api.py +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" diff --git a/dockerfiles/registrar.Dockerfile b/dockerfiles/registrar.Dockerfile index 004b8aa..e92102d 100644 --- a/dockerfiles/registrar.Dockerfile +++ b/dockerfiles/registrar.Dockerfile @@ -83,7 +83,7 @@ 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 -RUN curl -L -o ${REGISTRAR_CODE_DIR}/registrar/settings/devstack.py https://raw.githubusercontent.com/edx/devstack/huniafatima/add-devstack-config/py_configuration_files/registrar.py +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 diff --git a/dockerfiles/xqueue.Dockerfile b/dockerfiles/xqueue.Dockerfile index 52ec205..45f1d72 100644 --- a/dockerfiles/xqueue.Dockerfile +++ b/dockerfiles/xqueue.Dockerfile @@ -46,7 +46,7 @@ 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 -RUN curl -L -o ${XQUEUE_CODE_DIR}/xqueue/devstack.py https://raw.githubusercontent.com/edx/devstack/huniafatima/add-devstack-config/py_configuration_files/xqueue.py +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