You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/06/15 16:22:59 UTC
[10/26] allura git commit: [#7806] ticket:773 Make env host-mounted
to share with taskd container and allow update
[#7806] ticket:773 Make env host-mounted to share with taskd container and allow update
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/92e7184f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/92e7184f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/92e7184f
Branch: refs/heads/hs/7885
Commit: 92e7184fea115287ec33fcecc2566103cf338873
Parents: 2f4c16b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon May 25 15:33:40 2015 +0300
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jun 12 11:43:32 2015 -0400
----------------------------------------------------------------------
.gitignore | 1 +
Dockerfile | 8 +-------
docker-compose.yml | 12 ++++++------
3 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/92e7184f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cb2f607..44b29e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ var/
.nose-stopwatch-times
.noseids
env
+env-docker
Allura/allura/templates/home
Allura/allura/templates/var
Allura/production.ini
http://git-wip-us.apache.org/repos/asf/allura/blob/92e7184f/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 1fc3181..0be1159 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,4 @@ RUN apt-get update && apt-get install -y \
subversion \
python-svn
-ENV basedir /allura
-
-ADD . ${basedir}
-WORKDIR ${basedir}
-
-RUN pip install -r requirements.txt
-RUN ./rebuild-all.bash
+WORKDIR /allura
http://git-wip-us.apache.org/repos/asf/allura/blob/92e7184f/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 38b3764..d0a8a3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,14 @@
web:
build: .
working_dir: /allura
- command: paster serve Allura/docker-dev.ini --reload
+ command: bash -c 'cd Allura && paster serve docker-dev.ini --reload'
ports:
- "8080:8080"
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
# 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
@@ -18,11 +21,8 @@ taskd:
image: allura_web
working_dir: /allura/Allura
command: paster taskd docker-dev.ini
- volumes:
- - .:/allura
- - /allura-data/scm/git:/allura-data/scm/git
- - /allura-data/scm/hg:/allura-data/scm/hg
- - /allura-data/scm/svn:/allura-data/scm/svn
+ volumes_from:
+ - web
links:
- mongo
- solr