Commit 422a1007f820af5d78ab887d2599a35663610339

Authored by Matthijs Brouwer
1 parent 9bc44f11

added fallback for mirror

docker/Dockerfile
... ... @@ -17,69 +17,83 @@ RUN mkdir lib
17 17  
18 18 ADD https://github.com/meertensinstituut/mtas/releases/download/20170331/mtas-6.5.0.jar /root/lib/
19 19  
20   -RUN apt-get update && apt-get install -y 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 \
22   -&& solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/6.5.0/solr-6.5.0.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \
23   -&& curl -o /root/solr-6.5.0.tgz -O $solrurl \
24   -&& mathurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \
25   -&& curl -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl \
26   -&& tar xzf lib/commons-math3-3.6.1-bin.tar.gz -C lib commons-math3-3.6.1/commons-math3-3.6.1.jar --strip-components=1 \
27   -&& rm lib/commons-math3-3.6.1-bin.tar.gz \
28   -&& svn export https://github.com/meertensinstituut/mtas/trunk/docker/ data \
29   -&& add-apt-repository -y ppa:webupd8team/java \
30   -&& apt-get update \
31   -&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections \
32   -&& apt-get install -y oracle-java8-installer \
33   -&& rm -rf /var/lib/apt/lists/* \
34   -&& tar xzf solr-6.5.0.tgz solr-6.5.0/bin/install_solr_service.sh --strip-components=2 \
35   -&& bash ./install_solr_service.sh solr-6.5.0.tgz && rm install_solr_service.sh && rm -rf solr-6.5.0.tgz \
36   -&& service apache2 stop \
37   -&& echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf \
38   -&& a2enmod proxy \
39   -&& a2enmod proxy_http \
40   -&& a2enmod proxy_ajp \
41   -&& a2enmod rewrite \
42   -&& a2enmod deflate \
43   -&& a2enmod headers \
44   -&& a2enmod proxy_balancer \
45   -&& a2enmod proxy_connect \
46   -&& a2enmod proxy_html \
47   -&& a2enmod xml2enc \
48   -&& a2enconf fqdn \
49   -&& sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf \
50   -&& rm -rf /var/www/html/* \
51   -&& mkdir /var/www/html/demo \
52   -&& cp -rp data/*-samples /var/www/html/demo/ \
53   -&& gunzip -r /var/www/html/demo \
54   -&& cp -rp data/site/* /var/www/html \
55   -&& chmod -R 755 /var/www/html \
56   -&& printf "echo\n" >> /start.sh \
57   -&& printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \
58   -&& printf "echo \" Timestamp 2017-03-31 06:10\"\n" >> /start.sh \
59   -&& printf "echo \" Lucene/Solr version 6.5.0\"\n" >> /start.sh \
60   -&& printf "echo \" Mtas release 20170331\"\n" >> /start.sh \
61   -&& printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \
62   -&& printf "echo \"=======================================================================\"\n" >> /start.sh \
63   -&& printf "echo\n" >> /start.sh \
64   -&& printf "service solr start\nservice apache2 start\n" >> /start.sh \
65   -&& chmod 755 /start.sh \
66   -&& mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf \
67   -&& echo "name=demo1" > demo1/core.properties \
68   -&& cp lib/commons-math3-3.6.1.jar demo1/lib/ \
69   -&& cp lib/mtas-6.5.0.jar demo1/lib/ \
70   -&& cp data/solrconfig.xml demo1/conf/ \
71   -&& cp data/schemaBasic.xml demo1/conf/schema.xml \
72   -&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \
73   -&& chmod -R 777 demo1 \
74   -&& cp -rp demo1 demo2 \
75   -&& cp data/schemaFull.xml demo2/conf/schema.xml \
76   -&& echo "name=demo2" > demo2/core.properties \
77   -&& cp -rp demo1 demo3 \
78   -&& cp data/schemaFull.xml demo3/conf/schema.xml \
79   -&& echo "name=demo3" > demo3/core.properties \
80   -&& mv demo1 /var/solr/data/ \
81   -&& mv demo2 /var/solr/data/ \
82   -&& mv demo3 /var/solr/data/
  20 +RUN apt-get update && apt-get install -y 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
  22 +
  23 +RUN mathurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \
  24 + curl -f -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl && \
  25 + if [ ! -f /root/lib/commons-math3-3.6.1-bin.tar.gz ]; then \
  26 + echo "Commons-math3 not found in mirror, falling back to apache archive"; \
  27 + mathurl="http://archive.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz"; \
  28 + curl -f -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl; \
  29 + fi && \
  30 + tar xzf lib/commons-math3-3.6.1-bin.tar.gz -C lib commons-math3-3.6.1/commons-math3-3.6.1.jar --strip-components=1 && \
  31 + rm lib/commons-math3-3.6.1-bin.tar.gz
  32 +
  33 +RUN svn export https://github.com/meertensinstituut/mtas/trunk/docker/ data
83 34  
84   -CMD bash -C '/start.sh'; 'bash'
  35 +RUN add-apt-repository -y ppa:webupd8team/java && \
  36 + apt-get update && \
  37 + echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
  38 + apt-get install -y oracle-java8-installer && \
  39 + rm -rf /var/lib/apt/lists/*
85 40  
  41 +RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/6.5.0/solr-6.5.0.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \
  42 + curl -f -o /root/solr-6.5.0.tgz -O $solrurl && \
  43 + if [ ! -f /root/solr-6.5.0.tgz ]; then \
  44 + echo "Solr 6.5.0 not found in mirror, falling back to apache archive"; \
  45 + solrurl="http://archive.apache.org/dist/lucene/solr/6.5.0/solr-6.5.0.tgz"; \
  46 + curl -f -o /root/solr-6.5.0.tgz -O $solrurl; \
  47 + fi && \
  48 + tar xzf solr-6.5.0.tgz solr-6.5.0/bin/install_solr_service.sh --strip-components=2 && \
  49 + bash ./install_solr_service.sh solr-6.5.0.tgz && rm install_solr_service.sh && rm -rf solr-6.5.0.tgz
  50 +
  51 +RUN service apache2 stop && \
  52 + echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf && \
  53 + a2enmod proxy && \
  54 + a2enmod proxy_http && \
  55 + a2enmod proxy_ajp && \
  56 + a2enmod rewrite && \
  57 + a2enmod deflate && \
  58 + a2enmod headers && \
  59 + a2enmod proxy_balancer && \
  60 + a2enmod proxy_connect && \
  61 + a2enmod proxy_html && \
  62 + a2enmod xml2enc && \
  63 + a2enconf fqdn && \
  64 + sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf && \
  65 + rm -rf /var/www/html/* && \
  66 + mkdir /var/www/html/demo && \
  67 + cp -rp data/*-samples /var/www/html/demo/ && \
  68 + gunzip -r /var/www/html/demo && \
  69 + cp -rp data/site/* /var/www/html && \
  70 + chmod -R 755 /var/www/html && \
  71 + printf "echo\n" >> /start.sh && \
  72 + printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \
  73 + printf "echo \" Timestamp 2017-03-31 06:10\"\n" >> /start.sh && \
  74 + printf "echo \" Lucene/Solr version 6.5.0\"\n" >> /start.sh && \
  75 + printf "echo \" Mtas release 20170331\"\n" >> /start.sh && \
  76 + printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh && \
  77 + printf "echo \"=======================================================================\"\n" >> /start.sh && \
  78 + printf "echo\n" >> /start.sh && \
  79 + printf "service solr start\nservice apache2 start\n" >> /start.sh && \
  80 + chmod 755 /start.sh && \
  81 + mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf && \
  82 + echo "name=demo1" > demo1/core.properties && \
  83 + cp lib/commons-math3-3.6.1.jar demo1/lib/ && \
  84 + cp lib/mtas-6.5.0.jar demo1/lib/ && \
  85 + cp data/solrconfig.xml demo1/conf/ && \
  86 + cp data/schemaBasic.xml demo1/conf/schema.xml && \
  87 + cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ && \
  88 + chmod -R 777 demo1 && \
  89 + cp -rp demo1 demo2 && \
  90 + cp data/schemaFull.xml demo2/conf/schema.xml && \
  91 + echo "name=demo2" > demo2/core.properties && \
  92 + cp -rp demo1 demo3 && \
  93 + cp data/schemaFull.xml demo3/conf/schema.xml && \
  94 + echo "name=demo3" > demo3/core.properties && \
  95 + mv demo1 /var/solr/data/ && \
  96 + mv demo2 /var/solr/data/ && \
  97 + mv demo3 /var/solr/data/
  98 +
  99 +CMD bash -C '/start.sh'; 'bash'
86 100 \ No newline at end of file
... ...
src/docker/Dockerfile
... ... @@ -17,69 +17,83 @@ RUN mkdir lib
17 17  
18 18 ADD https://github.com/meertensinstituut/mtas/releases/download/${currentDevelopmentRelease}/mtas-${currentDevelopmentVersion}.jar /root/lib/
19 19  
20   -RUN apt-get update && apt-get install -y 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 \
22   -&& solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/${currentDevelopmentVersion}/solr-${currentDevelopmentVersion}.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \
23   -&& curl -o /root/solr-${currentDevelopmentVersion}.tgz -O $solrurl \
24   -&& mathurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \
25   -&& curl -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl \
26   -&& tar xzf lib/commons-math3-3.6.1-bin.tar.gz -C lib commons-math3-3.6.1/commons-math3-3.6.1.jar --strip-components=1 \
27   -&& rm lib/commons-math3-3.6.1-bin.tar.gz \
28   -&& svn export https://github.com/meertensinstituut/mtas/trunk/docker/ data \
29   -&& add-apt-repository -y ppa:webupd8team/java \
30   -&& apt-get update \
31   -&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections \
32   -&& apt-get install -y oracle-java8-installer \
33   -&& rm -rf /var/lib/apt/lists/* \
34   -&& tar xzf solr-${currentDevelopmentVersion}.tgz solr-${currentDevelopmentVersion}/bin/install_solr_service.sh --strip-components=2 \
35   -&& bash ./install_solr_service.sh solr-${currentDevelopmentVersion}.tgz && rm install_solr_service.sh && rm -rf solr-${currentDevelopmentVersion}.tgz \
36   -&& service apache2 stop \
37   -&& echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf \
38   -&& a2enmod proxy \
39   -&& a2enmod proxy_http \
40   -&& a2enmod proxy_ajp \
41   -&& a2enmod rewrite \
42   -&& a2enmod deflate \
43   -&& a2enmod headers \
44   -&& a2enmod proxy_balancer \
45   -&& a2enmod proxy_connect \
46   -&& a2enmod proxy_html \
47   -&& a2enmod xml2enc \
48   -&& a2enconf fqdn \
49   -&& sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf \
50   -&& rm -rf /var/www/html/* \
51   -&& mkdir /var/www/html/demo \
52   -&& cp -rp data/*-samples /var/www/html/demo/ \
53   -&& gunzip -r /var/www/html/demo \
54   -&& cp -rp data/site/* /var/www/html \
55   -&& chmod -R 755 /var/www/html \
56   -&& printf "echo\n" >> /start.sh \
57   -&& printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \
58   -&& printf "echo \" Timestamp ${timestamp}\"\n" >> /start.sh \
59   -&& printf "echo \" Lucene/Solr version ${currentDevelopmentVersion}\"\n" >> /start.sh \
60   -&& printf "echo \" Mtas release ${currentDevelopmentRelease}\"\n" >> /start.sh \
61   -&& printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \
62   -&& printf "echo \"=======================================================================\"\n" >> /start.sh \
63   -&& printf "echo\n" >> /start.sh \
64   -&& printf "service solr start\nservice apache2 start\n" >> /start.sh \
65   -&& chmod 755 /start.sh \
66   -&& mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf \
67   -&& echo "name=demo1" > demo1/core.properties \
68   -&& cp lib/commons-math3-3.6.1.jar demo1/lib/ \
69   -&& cp lib/mtas-${currentDevelopmentVersion}.jar demo1/lib/ \
70   -&& cp data/solrconfig.xml demo1/conf/ \
71   -&& cp data/schemaBasic.xml demo1/conf/schema.xml \
72   -&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \
73   -&& chmod -R 777 demo1 \
74   -&& cp -rp demo1 demo2 \
75   -&& cp data/schemaFull.xml demo2/conf/schema.xml \
76   -&& echo "name=demo2" > demo2/core.properties \
77   -&& cp -rp demo1 demo3 \
78   -&& cp data/schemaFull.xml demo3/conf/schema.xml \
79   -&& echo "name=demo3" > demo3/core.properties \
80   -&& mv demo1 /var/solr/data/ \
81   -&& mv demo2 /var/solr/data/ \
82   -&& mv demo3 /var/solr/data/
  20 +RUN apt-get update && apt-get install -y 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
  22 +
  23 +RUN mathurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \
  24 + curl -f -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl && \
  25 + if [ ! -f /root/lib/commons-math3-3.6.1-bin.tar.gz ]; then \
  26 + echo "Commons-math3 not found in mirror, falling back to apache archive"; \
  27 + mathurl="http://archive.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz"; \
  28 + curl -f -o /root/lib/commons-math3-3.6.1-bin.tar.gz -O $mathurl; \
  29 + fi && \
  30 + tar xzf lib/commons-math3-3.6.1-bin.tar.gz -C lib commons-math3-3.6.1/commons-math3-3.6.1.jar --strip-components=1 && \
  31 + rm lib/commons-math3-3.6.1-bin.tar.gz
  32 +
  33 +RUN svn export https://github.com/meertensinstituut/mtas/trunk/docker/ data
83 34  
84   -CMD bash -C '/start.sh'; 'bash'
  35 +RUN add-apt-repository -y ppa:webupd8team/java && \
  36 + apt-get update && \
  37 + echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
  38 + apt-get install -y oracle-java8-installer && \
  39 + rm -rf /var/lib/apt/lists/*
85 40  
  41 +RUN solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/${currentDevelopmentVersion}/solr-${currentDevelopmentVersion}.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) && \
  42 + curl -f -o /root/solr-${currentDevelopmentVersion}.tgz -O $solrurl && \
  43 + if [ ! -f /root/solr-${currentDevelopmentVersion}.tgz ]; then \
  44 + echo "Solr ${currentDevelopmentVersion} not found in mirror, falling back to apache archive"; \
  45 + solrurl="http://archive.apache.org/dist/lucene/solr/${currentDevelopmentVersion}/solr-${currentDevelopmentVersion}.tgz"; \
  46 + curl -f -o /root/solr-${currentDevelopmentVersion}.tgz -O $solrurl; \
  47 + fi && \
  48 + tar xzf solr-${currentDevelopmentVersion}.tgz solr-${currentDevelopmentVersion}/bin/install_solr_service.sh --strip-components=2 && \
  49 + bash ./install_solr_service.sh solr-${currentDevelopmentVersion}.tgz && rm install_solr_service.sh && rm -rf solr-${currentDevelopmentVersion}.tgz
  50 +
  51 +RUN service apache2 stop && \
  52 + echo "ServerName localhost" | tee /etc/apache2/conf-available/fqdn.conf && \
  53 + a2enmod proxy && \
  54 + a2enmod proxy_http && \
  55 + a2enmod proxy_ajp && \
  56 + a2enmod rewrite && \
  57 + a2enmod deflate && \
  58 + a2enmod headers && \
  59 + a2enmod proxy_balancer && \
  60 + a2enmod proxy_connect && \
  61 + a2enmod proxy_html && \
  62 + a2enmod xml2enc && \
  63 + a2enconf fqdn && \
  64 + sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf && \
  65 + rm -rf /var/www/html/* && \
  66 + mkdir /var/www/html/demo && \
  67 + cp -rp data/*-samples /var/www/html/demo/ && \
  68 + gunzip -r /var/www/html/demo && \
  69 + cp -rp data/site/* /var/www/html && \
  70 + chmod -R 755 /var/www/html && \
  71 + printf "echo\n" >> /start.sh && \
  72 + printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh && \
  73 + printf "echo \" Timestamp ${timestamp}\"\n" >> /start.sh && \
  74 + printf "echo \" Lucene/Solr version ${currentDevelopmentVersion}\"\n" >> /start.sh && \
  75 + printf "echo \" Mtas release ${currentDevelopmentRelease}\"\n" >> /start.sh && \
  76 + printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh && \
  77 + printf "echo \"=======================================================================\"\n" >> /start.sh && \
  78 + printf "echo\n" >> /start.sh && \
  79 + printf "service solr start\nservice apache2 start\n" >> /start.sh && \
  80 + chmod 755 /start.sh && \
  81 + mkdir demo1 && mkdir demo1/lib && mkdir demo1/conf && \
  82 + echo "name=demo1" > demo1/core.properties && \
  83 + cp lib/commons-math3-3.6.1.jar demo1/lib/ && \
  84 + cp lib/mtas-${currentDevelopmentVersion}.jar demo1/lib/ && \
  85 + cp data/solrconfig.xml demo1/conf/ && \
  86 + cp data/schemaBasic.xml demo1/conf/schema.xml && \
  87 + cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ && \
  88 + chmod -R 777 demo1 && \
  89 + cp -rp demo1 demo2 && \
  90 + cp data/schemaFull.xml demo2/conf/schema.xml && \
  91 + echo "name=demo2" > demo2/core.properties && \
  92 + cp -rp demo1 demo3 && \
  93 + cp data/schemaFull.xml demo3/conf/schema.xml && \
  94 + echo "name=demo3" > demo3/core.properties && \
  95 + mv demo1 /var/solr/data/ && \
  96 + mv demo2 /var/solr/data/ && \
  97 + mv demo3 /var/solr/data/
  98 +
  99 +CMD bash -C '/start.sh'; 'bash'
86 100 \ No newline at end of file
... ...