From 35bd13b61d425e4dd1b347e0556e3b541e68ed9a Mon Sep 17 00:00:00 2001
From: Matthijs Brouwer <matthijs@brouwer.info>
Date: Sat, 12 Jan 2019 12:28:13 +0100
Subject: [PATCH] Update dockerfile to version 7.6.0.0

---
 docker/Dockerfile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 347246a..7cd9603 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Automatically generated Dockerfile 
-# - Build 2018-11-06 15:12
-# - Lucene/Solr version 7.5.0
-# - Mtas release 7.5.0.0 
+# - Build 2019-01-12 11:24
+# - Lucene/Solr version 7.6.0
+# - Mtas release 7.6.0.0 
 #
 
 FROM ubuntu:16.04
@@ -15,7 +15,7 @@ WORKDIR "/root"
 
 RUN mkdir lib 
 
-ADD https://github.com/textexploration/mtas/releases/download/v7.5.0.0/mtas-7.5.0.0.jar /root/lib/
+ADD https://github.com/textexploration/mtas/releases/download/v7.6.0.0/mtas-7.6.0.0.jar /root/lib/
 
 RUN apt-get update && apt-get install -y locales lsof software-properties-common python-software-properties apache2 curl subversion && \
     locale-gen en_US.UTF-8 en_US && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en
@@ -40,17 +40,17 @@ RUN add-apt-repository -y ppa:webupd8team/java && \
     apt-get install -y oracle-java8-installer && \
     rm -rf /var/lib/apt/lists/*
 
-RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/7.5.0/solr-7.5.0.tgz' |   grep -o '<strong>[^<]*</strong>' |   sed 's/<[^>]*>//g' |   head -1) && \
+RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/7.6.0/solr-7.6.0.tgz' |   grep -o '<strong>[^<]*</strong>' |   sed 's/<[^>]*>//g' |   head -1) && \
     if echo "$solrurl" | grep -q '^.*[^ ].*$'; then \
-      curl -f -o /root/solr-7.5.0.tgz -O $solrurl || true; \
+      curl -f -o /root/solr-7.6.0.tgz -O $solrurl || true; \
     fi && \
-    if [ ! -f /root/solr-7.5.0.tgz ]; then \
-      echo "Solr 7.5.0 not found in mirror, falling back to apache archive"; \ 
-      solrurl="http://archive.apache.org/dist/lucene/solr/7.5.0/solr-7.5.0.tgz"; \
-      curl -f -o /root/solr-7.5.0.tgz -O $solrurl; \ 
+    if [ ! -f /root/solr-7.6.0.tgz ]; then \
+      echo "Solr 7.6.0 not found in mirror, falling back to apache archive"; \ 
+      solrurl="http://archive.apache.org/dist/lucene/solr/7.6.0/solr-7.6.0.tgz"; \
+      curl -f -o /root/solr-7.6.0.tgz -O $solrurl; \ 
     fi && \    
-    tar xzf solr-7.5.0.tgz solr-7.5.0/bin/install_solr_service.sh --strip-components=2 && \
-    bash ./install_solr_service.sh solr-7.5.0.tgz && rm install_solr_service.sh && rm -rf solr-7.5.0.tgz
+    tar xzf solr-7.6.0.tgz solr-7.6.0/bin/install_solr_service.sh --strip-components=2 && \
+    bash ./install_solr_service.sh solr-7.6.0.tgz && rm install_solr_service.sh && rm -rf solr-7.6.0.tgz
     
 RUN service apache2 stop && \
     echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf && \
@@ -74,9 +74,9 @@ RUN service apache2 stop && \
     chmod -R 755 /var/www/html && \
     printf "echo\n" >> /start.sh && \
     printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \
-    printf "echo \"  Timestamp 2018-11-06 15:12\"\n" >> /start.sh && \
-    printf "echo \"  Lucene/Solr version 7.5.0\"\n" >> /start.sh && \
-    printf "echo \"  Mtas release 7.5.0.0\"\n" >> /start.sh && \
+    printf "echo \"  Timestamp 2019-01-12 11:24\"\n" >> /start.sh && \
+    printf "echo \"  Lucene/Solr version 7.6.0\"\n" >> /start.sh && \
+    printf "echo \"  Mtas release 7.6.0.0\"\n" >> /start.sh && \
     printf "echo \"  See https://textexploration.github.io/mtas/ for more information\"\n" >> /start.sh && \
     printf "echo \"=======================================================================\"\n" >> /start.sh && \
     printf "echo\n" >> /start.sh && \
@@ -85,7 +85,7 @@ RUN service apache2 stop && \
     mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf && \
     echo "name=demo1" > demo1/core.properties && \
     cp lib/commons-math3-3.6.1.jar demo1/lib/ && \
-    cp lib/mtas-7.5.0.0.jar demo1/lib/ && \
+    cp lib/mtas-7.6.0.0.jar demo1/lib/ && \
     cp data/solrconfig.xml demo1/conf/ && \
     cp data/schemaBasic.xml demo1/conf/schema.xml && \
     cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ && \
-- 
GitLab