You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/08/19 17:17:53 UTC

[1/2] allura git commit: [#8062] set project name explicitly instead of requiring people to rename their directories

Repository: allura
Updated Branches:
  refs/heads/master 54447fc65 -> ebdd035e5


[#8062] set project name explicitly instead of requiring people to rename their directories


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

Branch: refs/heads/master
Commit: ebdd035e5e0bb4b63b96ff93881b4d43bd6570fa
Parents: 0e68bc4
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Aug 18 14:18:52 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Aug 19 13:17:32 2016 -0400

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/ebdd035e/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index e173c52..ab50ee5 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -244,12 +244,13 @@ Install `Docker <http://docs.docker.com/installation/>`_ and `Docker Compose <ht
 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).
 
-Rename your directory to just "allura" and run the following commands in that directory:
+Run the following commands in your allura directory:
 
 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):


[2/2] allura git commit: Update docker-compose logs commands to work best with Compose 1.7+

Posted by br...@apache.org.
Update docker-compose logs commands to work best with Compose 1.7+


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

Branch: refs/heads/master
Commit: 0e68bc47f303b3aa55cb6617828d1e081daccf7e
Parents: 54447fc
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Aug 18 14:17:18 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Aug 19 13:17:32 2016 -0400

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0e68bc47/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 159f4e7..e173c52 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -338,14 +338,14 @@ View logs from all services:
 
 .. code-block:: bash
 
-    docker-compose logs
+    docker-compose logs -f
 
 You can specify one or more services to view logs only from them, e.g. to see
 outgoing mail:
 
 .. code-block:: bash
 
-    docker-compose logs outmail
+    docker-compose logs outmail -f
 
 Update requirements and reinstall apps: