From 82a0f1c5d01409f2e89eb072a11841c43cb91486 Mon Sep 17 00:00:00 2001 From: Matthijs Brouwer Date: Mon, 3 Feb 2020 20:04:28 +0100 Subject: [PATCH] Update dockerfile to version 8.4.1.0 --- docker/Dockerfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3e6c1cdb1..6d825f1b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ # Automatically generated Dockerfile -# - Build 2020-02-02 17:12 -# - Lucene/Solr version 8.1.1 -# - Mtas release 8.1.1.1 +# - Build 2020-02-03 19:01 +# - Lucene/Solr version 8.4.1 +# - Mtas release 8.4.1.0 # FROM ubuntu:16.04 @@ -15,7 +15,7 @@ WORKDIR "/root" RUN mkdir lib -ADD https://github.com/textexploration/mtas/releases/download/v8.1.1.1/mtas-8.1.1.1.jar /root/lib/ +ADD https://github.com/textexploration/mtas/releases/download/v8.4.1.0/mtas-8.4.1.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/8.1.1/solr-8.1.1.tgz' | grep -o '[^<]*' | sed 's/<[^>]*>//g' | head -1) && \ +RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/8.4.1/solr-8.4.1.tgz' | grep -o '[^<]*' | sed 's/<[^>]*>//g' | head -1) && \ if echo "$solrurl" | grep -q '^.*[^ ].*$'; then \ - curl -f -o /root/solr-8.1.1.tgz -O $solrurl || true; \ + curl -f -o /root/solr-8.4.1.tgz -O $solrurl || true; \ fi && \ - if [ ! -f /root/solr-8.1.1.tgz ]; then \ - echo "Solr 8.1.1 not found in mirror, falling back to apache archive"; \ - solrurl="http://archive.apache.org/dist/lucene/solr/8.1.1/solr-8.1.1.tgz"; \ - curl -f -o /root/solr-8.1.1.tgz -O $solrurl; \ + if [ ! -f /root/solr-8.4.1.tgz ]; then \ + echo "Solr 8.4.1 not found in mirror, falling back to apache archive"; \ + solrurl="http://archive.apache.org/dist/lucene/solr/8.4.1/solr-8.4.1.tgz"; \ + curl -f -o /root/solr-8.4.1.tgz -O $solrurl; \ fi && \ - tar xzf solr-8.1.1.tgz solr-8.1.1/bin/install_solr_service.sh --strip-components=2 && \ - bash ./install_solr_service.sh solr-8.1.1.tgz && rm install_solr_service.sh && rm -rf solr-8.1.1.tgz + tar xzf solr-8.4.1.tgz solr-8.4.1/bin/install_solr_service.sh --strip-components=2 && \ + bash ./install_solr_service.sh solr-8.4.1.tgz && rm install_solr_service.sh && rm -rf solr-8.4.1.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 2020-02-02 17:12\"\n" >> /start.sh && \ - printf "echo \" Lucene/Solr version 8.1.1\"\n" >> /start.sh && \ - printf "echo \" Mtas release 8.1.1.1\"\n" >> /start.sh && \ + printf "echo \" Timestamp 2020-02-03 19:01\"\n" >> /start.sh && \ + printf "echo \" Lucene/Solr version 8.4.1\"\n" >> /start.sh && \ + printf "echo \" Mtas release 8.4.1.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-8.1.1.1.jar demo1/lib/ && \ + cp lib/mtas-8.4.1.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/ && \