This is an automated email from the ASF dual-hosted git repository. dill0wn pushed a commit to branch dw/8399 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 2467dee011e575130ee97272b2dd845a5b6b0e3a Author: Dillon Walls <[email protected]> AuthorDate: Mon Oct 25 17:24:02 2021 -0400 [#8399] move default data location /allura-data -> ./allura-data This may break existing installations, if you run into trouble, you can export LOCAL_SHARED_DATA_ROOT=/allura-data, or modify ./.env to point to that location. --- .env | 1 + .gitignore | 1 + Allura/docs/getting_started/installation.rst | 19 +++++++++++-------- docker-compose-prod.yml | 6 +++--- docker-compose.yml | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 6c38244..34715bc 100644 --- a/.env +++ b/.env @@ -17,3 +17,4 @@ COMPOSE_PROJECT_NAME=allura +LOCAL_SHARED_DATA_ROOT=./allura-data \ No newline at end of file diff --git a/.gitignore b/.gitignore index 63e1bde..c620e79 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ report.clonedigger /Allura/src/ async-disk-cache/ ForgeGit/forgegit/tests/data/testgit.git/FETCH_HEAD +allura-data/ diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst index 0c06b18..7ed72e9 100644 --- a/Allura/docs/getting_started/installation.rst +++ b/Allura/docs/getting_started/installation.rst @@ -35,8 +35,7 @@ First run `Download the latest release <http://www.apache.org/dyn/closer.cgi/allura/>`_ of Allura, or `clone from git <https://forge-allura.apache.org/p/allura/git/ci/master/tree/>`_ for the bleeding edge. Install `Docker <http://docs.docker.com/installation/>`_ and `Docker Compose <https://docs.docker.com/compose/install/>`_. -On Linux, you may need to `create a docker group <https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group>`_. On Mac, make sure -you're in a directory that Virtual Box shares through to the VM (by default, anywhere in your home directory works). +On Linux, you may need to `create a docker group <https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group>`_. .. note:: @@ -64,7 +63,6 @@ Build/fetch all required images: .. code-block:: bash - export COMPOSE_PROJECT_NAME=allura docker-compose build Python and JS package setup (and first containers started): @@ -122,14 +120,19 @@ changes. Python environment: -- :file:`/allura-data/virtualenv/bin/python` +- :file:`./allura-data/virtualenv/bin/python` Services data: -- :file:`/allura-data/mongo` - mongo data -- :file:`/allura-data/solr` - SOLR index -- :code:`/allura-data/scm/{git,hg,svn}` - code repositories -- :file:`/allura-data/scm/snapshots` - generated code snapshots +- :file:`./allura-data/mongo` - mongo data +- :file:`./allura-data/solr` - SOLR index +- :code:`./allura-data/scm/{git,hg,svn}` - code repositories +- :file:`./allura-data/scm/snapshots` - generated code snapshots + + +.. note:: + + The :code:`./allura-data/` path can be overriden by setting the LOCAL_SHARED_DATA_ROOT environment variable Ports, exposed to host system ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index acb46ba..cee10b0 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -46,7 +46,7 @@ services: - "8080" volumes: &volumes - .:/allura # Allura source code from local host - - /allura-data:/allura-data # for virtualenv, scm repos, etc + - ${LOCAL_SHARED_DATA_ROOT}:/allura-data # for virtualenv, scm repos, etc links: - mongo - solr @@ -82,7 +82,7 @@ services: - "8983" volumes: - ./solr_config/allura:/opt/solr/server/solr/allura - - /allura-data/solr:/opt/solr/server/solr/allura/data + - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data restart: always mongo: @@ -90,7 +90,7 @@ services: ports: - "127.0.0.1:27017:27017" volumes: - - /allura-data/mongo:/data/db + - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db command: mongod --storageEngine wiredTiger restart: always diff --git a/docker-compose.yml b/docker-compose.yml index 6fbf5d0..38d76a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,8 +26,8 @@ services: - "8088:8088" volumes: &volumes - .:/allura # Allura source code from local host - - /allura-data:/allura-data # for virtualenv, scm repos, etc - - /allura-data/root/home:/root # for persistent home dir, mainly for pudb + - ${LOCAL_SHARED_DATA_ROOT}:/allura-data # for virtualenv, scm repos, etc + - ${LOCAL_SHARED_DATA_ROOT}/root/home:/root # for persistent home dir, mainly for pudb links: - mongo - solr @@ -49,14 +49,14 @@ services: - "8983:8983" volumes: - ./solr_config/allura:/opt/solr/server/solr/allura - - /allura-data/solr:/opt/solr/server/solr/allura/data + - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data mongo: image: mongo:4.2 ports: - "27017:27017" volumes: - - /allura-data/mongo:/data/db + - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db command: mongod --storageEngine wiredTiger outmail:
