Skip to content

Osama/add hawthorn support #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2019
Merged

Osama/add hawthorn support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7268d84
ADD: add hawthorn support
asamolion May 21, 2019
9f29381
DOC: update documentation
asamolion May 21, 2019
58fa5cb
FIX: remove shallow clone
asamolion May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ This is a custom fork of Open edX's docker based development environment, frankl

## Environment configuration

The `OPENEDX_RELEASE` variable should be set in your \*nix environment. Use the following command to set it.
The `OPENEDX_RELEASE` variable should be set in your \*nix environment. Use the following command to set it. Currently, `ironwood.master` and `hawthorn.master` releases of Open edX are supported.

```
$ export OPENEDX_RELEASE=ironwood.master
export OPENEDX_RELEASE=ironwood.master
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest pinning the OPENEDX_RELEASE to named release tags instead of just pointing the head to master. https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/named_releases.html#ironwood

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, that isn't how the devstack processes Open edX repos. It needs a dedicated branch to be able to properly clone and checkout repos.


OR

export OPENEDX_RELEASE=hawthorn.master
```

To avoid doing this everytime, add the above line to your bash or zsh profile.
Expand Down
7 changes: 5 additions & 2 deletions repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ repos=(
"https://github.com/edx/edx-notes-api.git"
"https://github.com/edx/xqueue.git"
"https://github.com/edx/edx-analytics-pipeline.git"
"https://github.com/edx/gradebook.git"
)

if [ "${OPENEDX_RELEASE}" == "ironwood.master" ]; then
repos+=("https://github.com/edx/gradebook.git")
fi

private_repos=(
# Needed to run whitelabel tests.
"https://github.com/edx/edx-themes.git"
Expand Down Expand Up @@ -106,7 +109,7 @@ _clone ()
if [ "${SHALLOW_CLONE}" == "1" ]; then
git clone --single-branch -b ${OPENEDX_GIT_BRANCH} -c core.symlinks=true --depth=1 ${repo}
else
git clone --single-branch -b ${OPENEDX_GIT_BRANCH} -c core.symlinks=true ${repo}
git clone -b ${OPENEDX_GIT_BRANCH} -c core.symlinks=true ${repo}
fi
fi
done
Expand Down
2 changes: 1 addition & 1 deletion wordpress/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y \
vim \
unzip \
libjpeg-dev \
libpng-dev \
Expand Down Expand Up @@ -66,7 +67,6 @@ RUN set -ex; \

RUN cp -R /usr/src/wordpress/. $WORDPRESS_DIR

ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/edunext-openedx-integrator.1.9.0.zip" $WORDPRESS_DIR/wp-content/plugins/
ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/advanced-custom-fields.5.7.12.zip" $WORDPRESS_DIR/wp-content/plugins/
ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/elementor.2.5.14.zip" $WORDPRESS_DIR/wp-content/plugins/
ADD --chown=www-data:www-data "https://downloads.wordpress.org/plugin/classic-editor.1.4.zip" $WORDPRESS_DIR/wp-content/plugins/
Expand Down