[14/18] allura git commit: [#7907] ticket:873 Move solr dir setup from docs to init-docker-dev.sh

[je...@apache.org]

[#7907] ticket:873 Move solr dir setup from docs to init-docker-dev.sh


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/52b00949
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/52b00949
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/52b00949

Branch: refs/heads/in/7907
Commit: 52b00949f4a633b22239860026ffb8542b1b7478
Parents: cfd0be7
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Dec 9 18:06:12 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Dec 9 18:06:12 2015 +0200

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 10 ----------
 scripts/init-docker-dev.sh                   |  7 ++++++-
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/52b00949/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 5433a1e..d022f20 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -252,16 +252,6 @@ First run
 
 Install `Docker <http://docs.docker.com/installation/>`_ and `Docker Compose <https://docs.docker.com/compose/install/>`_.
 
-Setup directory and permissions for solr data:
-
-.. code-block:: bash
-
-    sudo mkdir -p /allura-data/solr
-    sudo chmod 777 /allura-data/solr
-
-We need this because Docker Compose creates directories with root as an owner,
-but solr container runs solr from the different user.
-
 Build/fetch all required images (run these in allura source directory):
 
 .. code-block:: bash

http://git-wip-us.apache.org/repos/asf/allura/blob/52b00949/scripts/init-docker-dev.sh
----------------------------------------------------------------------
diff --git a/scripts/init-docker-dev.sh b/scripts/init-docker-dev.sh
index 2353419..046f517 100755
--- a/scripts/init-docker-dev.sh
+++ b/scripts/init-docker-dev.sh
@@ -27,6 +27,11 @@ echo -e "\nRunning scripts/init-docker-dev.sh\n"
 echo -e "Creating SCM directories\n"
 mkdir -p /allura-data/scm/{git,hg,svn,snapshots}
 
+echo -e "Creating directory for SOLR data\n"
+mkdir -p /allura-data/solr
+echo -e "Changing it's permissions to 777 so that container will have access to it\n"
+chmod 777 /allura-data/solr
+
 # share venv to allow update and sharing across containers
 if [ ! -e /allura-data/virtualenv ]; then
     echo -e "Creating virtualenv\n"
@@ -52,4 +57,4 @@ if [ ! -e /allura/Allura/allura/public/nf/js/build/transpiled.js ]; then
   npm run build
 fi
 
-echo "Done"
\ No newline at end of file
+echo "Done"