This is an automated email from the ASF dual-hosted git repository. gcruz pushed a commit to branch gc/8411 in repository https://gitbox.apache.org/repos/asf/allura.git
commit faab016e9590339083a39c95b2f4e358948a4f79 Author: Guillermo Cruz <[email protected]> AuthorDate: Mon Feb 14 11:29:44 2022 -0700 [#8411] inline path defaults in case .env does not loads --- Allura/docs/getting_started/installation.rst | 2 +- docker-compose-prod.yml | 6 +++--- docker-compose.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst index 7ed72e9..2b24fe4 100644 --- a/Allura/docs/getting_started/installation.rst +++ b/Allura/docs/getting_started/installation.rst @@ -35,7 +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 Linux, you may need to `create a docker group <https://docs.docker.com/engine/install/linux-postinstall/>`_. .. note:: diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index dd05162..958d16c 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 - - ${LOCAL_SHARED_DATA_ROOT}:/allura-data # for virtualenv, scm repos, etc + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}:/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 - - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}/solr:/opt/solr/server/solr/allura/data restart: always mongo: @@ -90,7 +90,7 @@ services: ports: - "127.0.0.1:27017:27017" volumes: - - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}/mongo:/data/db command: mongod --storageEngine wiredTiger restart: always diff --git a/docker-compose.yml b/docker-compose.yml index 38d76a3..0126da9 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 - - ${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 + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}:/allura-data # for virtualenv, scm repos, etc + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}/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 - - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}/solr:/opt/solr/server/solr/allura/data mongo: image: mongo:4.2 ports: - "27017:27017" volumes: - - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db + - ${LOCAL_SHARED_DATA_ROOT:-./allura-data}/mongo:/data/db command: mongod --storageEngine wiredTiger outmail:
