allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [2/3] allura git commit: [#7995] share python env in /allura-data not in local dir
Date Fri, 25 Sep 2015 21:08:02 GMT
[#7995] share python env in /allura-data not in local dir

This is so it won't be shared to host machine if using docker-machine (e.g. Mac/Win
using Docker Toolbox).  No point in sharing there since the environment has
different system libs linked and can't be re-used.

Also fixes a warning about relative paths.


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

Branch: refs/heads/master
Commit: efc4642cff21ffad1294a2e07e0d4da16693601e
Parents: b036c1c
Author: Dave Brondsema <dave@brondsema.net>
Authored: Thu Sep 24 13:03:29 2015 -0400
Committer: Heith Seewald <hseewald@hsmb.local>
Committed: Fri Sep 25 16:07:28 2015 -0500

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 8 +++++---
 docker-compose.yml                           | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/efc4642c/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 203d6f5..029e21a 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -244,12 +244,14 @@ Host-mounted volumes
 
 These are created on first run.
 
-Current directory mounted as :file:`/allura` inside containers.
+Current directory mounted as :file:`/allura` inside containers.  This means your current
source code in your host
+environment is shared with the containers.  You can edit Allura code directly, and the containers
will reflect your
+changes.
 
 Python environment:
 
-- :file:`env-docker/python`
-- :file:`env-docker/bin`
+- :file:`/allura-data/env-docker/python`
+- :file:`/allura-data/env-docker/bin`
 
 Services data:
 

http://git-wip-us.apache.org/repos/asf/allura/blob/efc4642c/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 155a421..6822677 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,8 @@ web:
   volumes:
     - .:/allura
     # mount env to allow update and sharing with taskd container
-    - env-docker/python:/usr/local/lib/python2.7
-    - env-docker/bin:/usr/local/bin
+    - /allura-data/env-docker/python:/usr/local/lib/python2.7
+    - /allura-data/env-docker/bin:/usr/local/bin
     # mounting it separatelly to create git, svn, hg directories automatically
     - /allura-data/scm/git:/allura-data/scm/git
     - /allura-data/scm/hg:/allura-data/scm/hg


Mime
View raw message