allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject allura git commit: Add a few helpful notes for Docker installation, move login info to Post-setup section so Docker installers see it too
Date Tue, 12 Apr 2016 19:20:31 GMT
Repository: allura
Updated Branches:
  refs/heads/master da6ee3b54 -> 12296f70d


Add a few helpful notes for Docker installation, move login info to Post-setup section so
Docker installers see it too


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

Branch: refs/heads/master
Commit: 12296f70d0ada1c990b8a9f65dc02aee1372f916
Parents: da6ee3b
Author: Dave Brondsema <dave@brondsema.net>
Authored: Tue Apr 12 11:46:53 2016 -0400
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Tue Apr 12 22:19:44 2016 +0300

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 24 +++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/12296f70/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index a96f329..159f4e7 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -224,15 +224,6 @@ Next Steps
 Go to the Allura webapp running on your `local machine <http://localhost:8080/>`_ port
8080.
 (If you're running this inside a VM, you'll probably have to configure the port forwarding
settings)
 
-You can log in with username `admin1`, `test-user` or `root`.  They all have password "foo".
 (For more details
-on the default data, see :file:`bootstrap.py`)
-
-There are a few default projects (like "test") and neighborhoods.  Feel free to experiment
with them.  If you want to
-register a new project in your own forge, visit `/p/add_project`.
-
-Extra
-^^^^^
-
 * Read :ref:`post-setup-instructions`
 * Ask questions and discuss Allura on the `allura-dev mailing list <http://mail-archives.apache.org/mod_mbox/allura-dev/>`_
 * Run the test suite (slow): :code:`$ ALLURA_VALIDATION=none ./run_tests`
@@ -250,8 +241,12 @@ 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).
+
+Rename your directory to just "allura" and run the following commands in that directory:
 
-Build/fetch all required images (run these in allura source directory):
+Build/fetch all required images:
 
 .. code-block:: bash
 
@@ -386,6 +381,15 @@ Connecting to mongo using a container:
 Post-setup instructions
 -----------------------
 
+Logging in and sample projects
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can log in with username `admin1`, `test-user` or `root`.  They all have password "foo".
 (For more details
+on the default data, see :file:`bootstrap.py`)
+
+There are a few default projects (like "test") and neighborhoods.  Feel free to experiment
with them.  If you want to
+register a new project in your own forge, visit `/p/add_project`.
+
 Create project for site-admin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 


Mime
View raw message