allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [11/16] allura git commit: [#7806] ticket:778 Add stuff for SCM snapshots
Date Fri, 12 Jun 2015 15:44:21 GMT
[#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/05ca971d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/05ca971d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/05ca971d

Branch: refs/heads/master
Commit: 05ca971d9fb4ca337328f40b47c9c49314ae3649
Parents: 260e5f5
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Sat May 30 13:31:44 2015 +0300
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jun 12 11:43:34 2015 -0400

----------------------------------------------------------------------
 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/05ca971d/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/05ca971d/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/05ca971d/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


Mime
View raw message