-
Notifications
You must be signed in to change notification settings - Fork 444
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: ensure mounted installable packages are installed as expected
Close #1016.
- Loading branch information
1 parent
f211b98
commit 0e37449
Showing
4 changed files
with
45 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
- [BugFix] Ensure mounted installable packages are installed as expected upon initialization. (by @dawoudsheraz) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# The initialization job contains various re-install operations needed to be done | ||
# on mounted directories (edx-platform, /mnt/*xblock, /mnt/<edx-ora, search, enterprise>) | ||
# 1. /mnt/* | ||
# Whenever xblocks or other installable packages are mounted, during the image build, they are copied over to container | ||
# and installed. This results in egg_info generation for the mounted directories. However, the egg_info is not carried | ||
# over to host. When the containers are launched, the host directories without egg_info are mounted on runtime | ||
# and disappear from pip list. | ||
# | ||
# 2. edx-platform | ||
# When a new local copy of edx-platform is bind-mounted, certain build | ||
# artifacts from the openedx image's edx-platform directory are lost. | ||
# We regenerate them here. | ||
|
||
|
||
for mounted_dir in /mnt/*; do | ||
if [ -f $mounted_dir/setup.py ] && ! ls $mounted_dir/*.egg-info >/dev/null 2>&1 ; then | ||
echo "Unable to locate egg-info in $mounted_dir" | ||
pip install -e $mounted_dir | ||
fi | ||
done | ||
|
||
if [ -f /openedx/edx-platform/bindmount-canary ] ; then | ||
# If this file exists, then edx-platform has not been bind-mounted, | ||
# so no build artifacts need to be regenerated. | ||
echo "Using edx-platform from image (not bind-mount)." | ||
echo "No extra setup is required." | ||
exit | ||
fi | ||
|
||
echo "Performing additional setup for bind-mounted edx-platform." | ||
set -x # Echo out executed lines | ||
|
||
# Regenerate Open_edX.egg-info | ||
pip install -e . | ||
|
||
# Regenerate node_modules | ||
npm clean-install | ||
|
||
# Regenerate static assets. | ||
openedx-assets build --env=dev | ||
|
||
set -x | ||
echo "Done setting up bind-mounted edx-platform." |
This file was deleted.
Oops, something went wrong.