You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/11/30 21:41:25 UTC
[04/14] allura git commit: Update docker images
Update docker images
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cb9f4774
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cb9f4774
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cb9f4774
Branch: refs/heads/db/7981
Commit: cb9f4774b6af175af2545811c8cd800cd4c1dae3
Parents: 6945bbd
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Nov 17 15:25:59 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Nov 17 15:25:59 2016 -0500
----------------------------------------------------------------------
Dockerfile | 7 ++++---
docker-compose.yml | 2 +-
scm_config/git-http/Dockerfile | 2 +-
solr_config/allura/conf/schema.xml | 8 +-------
4 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index f04b37b..9661f15 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-FROM ubuntu:14.04
+FROM ubuntu:16.04
RUN apt-get update && apt-get install -y \
git-core \
- python-dev \
+ python2.7-dev \
libssl-dev \
libldap2-dev \
libsasl2-dev \
@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y \
zip \
subversion \
python-svn \
- curl
+ curl \
+ sudo
# up-to-date version of node & npm
RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash - && \
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 316046e..ed19004 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,7 @@ taskd:
- outmail
solr:
- image: solr:5.3.1
+ image: solr:6-alpine # alpine is a very small distro base
ports:
- "8983:8983"
volumes:
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/scm_config/git-http/Dockerfile
----------------------------------------------------------------------
diff --git a/scm_config/git-http/Dockerfile b/scm_config/git-http/Dockerfile
index 8f5650f..b2e1b28 100644
--- a/scm_config/git-http/Dockerfile
+++ b/scm_config/git-http/Dockerfile
@@ -20,7 +20,7 @@
# not inspired by https://hub.docker.com/_/httpd/ which does a custom source-based install of httpd
# match main allura Dockerfile, for shared base
-FROM ubuntu:14.04
+FROM ubuntu:16.04
RUN apt-get update && apt-get install -y \
apache2 \
http://git-wip-us.apache.org/repos/asf/allura/blob/cb9f4774/solr_config/allura/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr_config/allura/conf/schema.xml b/solr_config/allura/conf/schema.xml
index 35c145e..afca496 100644
--- a/solr_config/allura/conf/schema.xml
+++ b/solr_config/allura/conf/schema.xml
@@ -505,12 +505,6 @@
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
<fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-
- <!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
- For more information about this and other Spatial fields new to Solr 4, see:
- http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
- -->
- <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
- geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+
</types>
</schema>