Skip to content

Instantly share code, notes, and snippets.

@hoffmannkrzysztof
Last active August 9, 2023 21:02
Show Gist options
  • Save hoffmannkrzysztof/232523f314cb39f1166f3fb680efa88a to your computer and use it in GitHub Desktop.
Save hoffmannkrzysztof/232523f314cb39f1166f3fb680efa88a to your computer and use it in GitHub Desktop.
diff --git a/Makefile b/Makefile
index b5db002..3527728 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,9 @@ dev.provision: dev.check-memory ## Provision dev environment with default servic
$(WINPTY) bash ./provision.sh $(DEFAULT_SERVICES)+e2e
make dev.stop
+dev.fix:
+ docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install --upgrade setuptools==51.1.1 && pip install --upgrade wheel==0.36.2'
+
dev.provision.%: ## Provision specified services.
echo $*
$(WINPTY) bash ./provision.sh $*
diff --git a/options.mk b/options.mk
index 1703ce8..513f833 100644
--- a/options.mk
+++ b/options.mk
@@ -68,7 +68,7 @@ FS_SYNC_STRATEGY ?= local-mounts
# The current value was chosen such that it would not change the existing
# Devstack behavior.
DEFAULT_SERVICES ?= \
-credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-publisher+frontend-app-learning+gradebook+lms+studio
+discovery+forum+frontend-app-publisher+frontend-app-learning+lms+studio
# All edX services, whether or not they are run by default.
# Separated by plus signs.
diff --git a/provision-lms.sh b/provision-lms.sh
index 6ec0221..f693049 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -39,6 +39,7 @@ docker-compose exec -T lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cac
# Create static assets for both LMS and Studio
for app in "${apps[@]}"; do
+ docker-compose exec -T $app bash -c 'source /edx/app/edxapp/edxapp_env && pip install --upgrade setuptools==51.1.1 && pip install --upgrade wheel==0.36.2'
docker-compose exec -T $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
done
diff --git a/repo.sh b/repo.sh
index a5bee76..6611007 100755
--- a/repo.sh
+++ b/repo.sh
@@ -27,7 +27,7 @@ repos=(
"https://github.com/edx/ecommerce.git"
"https://github.com/edx/edx-e2e-tests.git"
"https://github.com/edx/edx-notes-api.git"
- "https://github.com/edx/edx-platform.git"
+ "git@plisi-gitlab.opi.org.pl:opi-pib/edx-platform.git"
"https://github.com/edx/xqueue.git"
"https://github.com/edx/frontend-app-gradebook.git"
"https://github.com/edx/frontend-app-publisher.git"
@@ -48,7 +48,7 @@ ssh_repos=(
"git@github.com:edx/ecommerce.git"
"git@github.com:edx/edx-e2e-tests.git"
"git@github.com:edx/edx-notes-api.git"
- "git@github.com:edx/edx-platform.git"
+ "git@plisi-gitlab.opi.org.pl:opi-pib/edx-platform.git"
"git@github.com:edx/xqueue.git"
"git@github.com:edx/frontend-app-gradebook.git"
"git@github.com:edx/frontend-app-publisher.git"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment