dariah / mtas

Commit 56a2302e4982f28462e2ad2678b5ea2acf9843de

Authored by Matthijs Brouwer
1 parent 95709a49

Update dockerfile to version 7.4.0.0

Inline Side-by-side
Showing 1 changed file with 16 additions and 16 deletions
docker/Dockerfile
  View file @56a2302
1 # Automatically generated Dockerfile 1 # Automatically generated Dockerfile
2 -# - Build 2018-06-30 10:32  
3 -# - Lucene/Solr version 7.3.1  
4 -# - Mtas release 7.3.1.5 2 +# - Build 2018-07-08 09:42
  3 +# - Lucene/Solr version 7.4.0
  4 +# - Mtas release 7.4.0.0
5 # 5 #
6 6
7 FROM ubuntu:16.04 7 FROM ubuntu:16.04
@@ -15,7 +15,7 @@ WORKDIR "/root" @@ -15,7 +15,7 @@ WORKDIR "/root"
15 15
16 RUN mkdir lib 16 RUN mkdir lib
17 17
18 -ADD https://github.com/textexploration/mtas/releases/download/v7.3.1.5/mtas-7.3.1.5.jar /root/lib/ 18 +ADD https://github.com/textexploration/mtas/releases/download/v7.4.0.0/mtas-7.4.0.0.jar /root/lib/
19 19
20 RUN apt-get update && apt-get install -y locales lsof software-properties-common python-software-properties apache2 curl subversion && \ 20 RUN apt-get update && apt-get install -y locales lsof software-properties-common python-software-properties apache2 curl subversion && \
21 locale-gen en_US.UTF-8 en_US && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en 21 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 && \ @@ -40,17 +40,17 @@ RUN add-apt-repository -y ppa:webupd8team/java && \
40 apt-get install -y oracle-java8-installer && \ 40 apt-get install -y oracle-java8-installer && \
41 rm -rf /var/lib/apt/lists/* 41 rm -rf /var/lib/apt/lists/*
42 42
43 -RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/7.3.1/solr-7.3.1.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \ 43 +RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/7.4.0/solr-7.4.0.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \
44 if echo "$solrurl" | grep -q '^.*[^ ].*$'; then \ 44 if echo "$solrurl" | grep -q '^.*[^ ].*$'; then \
45 - curl -f -o /root/solr-7.3.1.tgz -O $solrurl || true; \ 45 + curl -f -o /root/solr-7.4.0.tgz -O $solrurl || true; \
46 fi && \ 46 fi && \
47 - if [ ! -f /root/solr-7.3.1.tgz ]; then \  
48 - echo "Solr 7.3.1 not found in mirror, falling back to apache archive"; \  
49 - solrurl="http://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz"; \  
50 - curl -f -o /root/solr-7.3.1.tgz -O $solrurl; \ 47 + if [ ! -f /root/solr-7.4.0.tgz ]; then \
  48 + echo "Solr 7.4.0 not found in mirror, falling back to apache archive"; \
  49 + solrurl="http://archive.apache.org/dist/lucene/solr/7.4.0/solr-7.4.0.tgz"; \
  50 + curl -f -o /root/solr-7.4.0.tgz -O $solrurl; \
51 fi && \ 51 fi && \
52 - tar xzf solr-7.3.1.tgz solr-7.3.1/bin/install_solr_service.sh --strip-components=2 && \  
53 - bash ./install_solr_service.sh solr-7.3.1.tgz && rm install_solr_service.sh && rm -rf solr-7.3.1.tgz 52 + tar xzf solr-7.4.0.tgz solr-7.4.0/bin/install_solr_service.sh --strip-components=2 && \
  53 + bash ./install_solr_service.sh solr-7.4.0.tgz && rm install_solr_service.sh && rm -rf solr-7.4.0.tgz
54 54
55 RUN service apache2 stop && \ 55 RUN service apache2 stop && \
56 echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf && \ 56 echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf && \
@@ -74,9 +74,9 @@ RUN service apache2 stop &amp;&amp; \ @@ -74,9 +74,9 @@ RUN service apache2 stop &amp;&amp; \
74 chmod -R 755 /var/www/html && \ 74 chmod -R 755 /var/www/html && \
75 printf "echo\n" >> /start.sh && \ 75 printf "echo\n" >> /start.sh && \
76 printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \ 76 printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \
77 - printf "echo \" Timestamp 2018-06-30 10:32\"\n" >> /start.sh && \  
78 - printf "echo \" Lucene/Solr version 7.3.1\"\n" >> /start.sh && \  
79 - printf "echo \" Mtas release 7.3.1.5\"\n" >> /start.sh && \ 77 + printf "echo \" Timestamp 2018-07-08 09:42\"\n" >> /start.sh && \
  78 + printf "echo \" Lucene/Solr version 7.4.0\"\n" >> /start.sh && \
  79 + printf "echo \" Mtas release 7.4.0.0\"\n" >> /start.sh && \
80 printf "echo \" See https://textexploration.github.io/mtas/ for more information\"\n" >> /start.sh && \ 80 printf "echo \" See https://textexploration.github.io/mtas/ for more information\"\n" >> /start.sh && \
81 printf "echo \"=======================================================================\"\n" >> /start.sh && \ 81 printf "echo \"=======================================================================\"\n" >> /start.sh && \
82 printf "echo\n" >> /start.sh && \ 82 printf "echo\n" >> /start.sh && \
@@ -85,7 +85,7 @@ RUN service apache2 stop &amp;&amp; \ @@ -85,7 +85,7 @@ RUN service apache2 stop &amp;&amp; \
85 mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf && \ 85 mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf && \
86 echo "name=demo1" > demo1/core.properties && \ 86 echo "name=demo1" > demo1/core.properties && \
87 cp lib/commons-math3-3.6.1.jar demo1/lib/ && \ 87 cp lib/commons-math3-3.6.1.jar demo1/lib/ && \
88 - cp lib/mtas-7.3.1.5.jar demo1/lib/ && \ 88 + cp lib/mtas-7.4.0.0.jar demo1/lib/ && \
89 cp data/solrconfig.xml demo1/conf/ && \ 89 cp data/solrconfig.xml demo1/conf/ && \
90 cp data/schemaBasic.xml demo1/conf/schema.xml && \ 90 cp data/schemaBasic.xml demo1/conf/schema.xml && \
91 cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ && \ 91 cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ && \