From 7268d84d29b52d4c32c3b22c0ac5d85e5dc5d945 Mon Sep 17 00:00:00 2001
From: Muhammad Osama Arshad <muhammadosamaarshad@gmail.com>
Date: Tue, 21 May 2019 12:39:49 +0500
Subject: [PATCH 1/3] ADD: add hawthorn support

---
 repo.sh              | 5 ++++-
 wordpress/Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/repo.sh b/repo.sh
index 21d3da0288..293b67fa56 100755
--- a/repo.sh
+++ b/repo.sh
@@ -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"
diff --git a/wordpress/Dockerfile b/wordpress/Dockerfile
index 66313abee3..34d4eca660 100644
--- a/wordpress/Dockerfile
+++ b/wordpress/Dockerfile
@@ -7,6 +7,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y \
+	    vim \
 		unzip \
 		libjpeg-dev \
 		libpng-dev \
@@ -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/

From 9f29381055adeb6fe5c0e73fc13d2fe6709b566e Mon Sep 17 00:00:00 2001
From: Muhammad Osama Arshad <muhammadosamaarshad@gmail.com>
Date: Tue, 21 May 2019 12:40:47 +0500
Subject: [PATCH 2/3] DOC: update documentation

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c888bed926..96b4c037fb 100644
--- a/README.md
+++ b/README.md
@@ -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
+
+OR
+
+export OPENEDX_RELEASE=hawthorn.master
 ```
 
 To avoid doing this everytime, add the above line to your bash or zsh profile.

From 58fa5cb0e87cbf6b0df8933464205c55ae0ef8d2 Mon Sep 17 00:00:00 2001
From: Muhammad Osama Arshad <muhammadosamaarshad@gmail.com>
Date: Tue, 21 May 2019 13:55:25 +0500
Subject: [PATCH 3/3] FIX: remove shallow clone

---
 repo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repo.sh b/repo.sh
index 293b67fa56..5bb9d57f33 100755
--- a/repo.sh
+++ b/repo.sh
@@ -109,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