You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/05/30 14:39:14 UTC
[11/14] allura git commit: [#7806] ticket:778 Add stuff for SCM
snapshots
[#7806] ticket:778 Add stuff for SCM snapshots
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f39aac64
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f39aac64
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f39aac64
Branch: refs/heads/ib/7806
Commit: f39aac6492bf9ad4a5deb3f6f9ec119812702ea1
Parents: 524c647
Author: Igor Bondarenko <je...@gmail.com>
Authored: Sat May 30 13:31:44 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Sat May 30 13:31:44 2015 +0300
----------------------------------------------------------------------
Allura/docker-dev.ini | 4 ++++
Dockerfile | 5 +++++
docker-compose.yml | 1 +
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f39aac64/Allura/docker-dev.ini
----------------------------------------------------------------------
diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini
index 2e22df7..0ce00eb 100644
--- a/Allura/docker-dev.ini
+++ b/Allura/docker-dev.ini
@@ -37,6 +37,10 @@ scm.host.rw.hg = /allura-data/scm/hg$path
scm.host.ro.svn = file:///allura-data/scm/svn$path/
scm.host.rw.svn = file:///allura-data/scm/svn$path/
+scm.repos.tarball.enable = true
+scm.repos.tarball.root = /allura-data/scm/snapshots/
+scm.repos.tarball.url_prefix = http://localhost:8080/
+
solr.server = http://solr:8983/solr
;forgemail.host = smtp
http://git-wip-us.apache.org/repos/asf/allura/blob/f39aac64/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 26ee833..e054b6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,12 @@ RUN apt-get update && apt-get install -y \
libjpeg8-dev \
zlib1g-dev \
python-pip \
+ zip \
subversion \
python-svn
+# Snapshot generation for SVN (and maybe other SCMs) might fail without this
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+
WORKDIR /allura
http://git-wip-us.apache.org/repos/asf/allura/blob/f39aac64/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 835f91a..586afed 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ web:
- /allura-data/scm/git:/allura-data/scm/git
- /allura-data/scm/hg:/allura-data/scm/hg
- /allura-data/scm/svn:/allura-data/scm/svn
+ - /allura-data/scm/snapshots:/allura-data/scm/snapshots
links:
- mongo
- solr