Commit ef6c60dcd2ea1669e29fb9ad50502c5331b15fbc
1 parent
0f17e329
fix docker
Showing
2 changed files
with
10 additions
and
12 deletions
docker/Dockerfile
1 | 1 | # Automatically generated Dockerfile |
2 | -# - Build 2016-12-30 12:12 | |
2 | +# - Build 2016-12-30 14:18 | |
3 | 3 | # - Lucene/Solr version 6.3.0 |
4 | 4 | # - Mtas release 20161230 |
5 | 5 | # |
... | ... | @@ -48,14 +48,13 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
48 | 48 | && sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf \ |
49 | 49 | && rm -rf /var/www/html/* \ |
50 | 50 | && mkdir /var/www/html/demo \ |
51 | -&& cp -rp data/folia-samples /var/www/html/demo/ \ | |
52 | -&& cp -rp data/isotei-samples /var/www/html/demo/ \ | |
51 | +&& cp -rp data/*samples /var/www/html/demo/ \ | |
53 | 52 | && gunzip -r /var/www/html/demo \ |
54 | -&& cp -rp data/site/* /var/www/html/ \ | |
53 | +&& cp -rp data/site/* /var/www/html \ | |
55 | 54 | && chmod -R 755 /var/www/html \ |
56 | 55 | && printf "echo\n" >> /start.sh \ |
57 | 56 | && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \ |
58 | -&& printf "echo \" Timestamp 2016-12-30 12:12\"\n" >> /start.sh \ | |
57 | +&& printf "echo \" Timestamp 2016-12-30 14:18\"\n" >> /start.sh \ | |
59 | 58 | && printf "echo \" Lucene/Solr version 6.3.0\"\n" >> /start.sh \ |
60 | 59 | && printf "echo \" Mtas release 20161230\"\n" >> /start.sh \ |
61 | 60 | && printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \ |
... | ... | @@ -73,10 +72,10 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
73 | 72 | && chmod -R 777 demo1 \ |
74 | 73 | && cp -rp demo1 demo2 \ |
75 | 74 | && cp data/schemaFull.xml demo2/conf/schema.xml \ |
76 | -&& echo "name=demo2" > demo2/core.properties\ | |
75 | +&& echo "name=demo2" > demo2/core.properties \ | |
77 | 76 | && cp -rp demo1 demo3 \ |
78 | 77 | && cp data/schemaFull.xml demo3/conf/schema.xml \ |
79 | -&& echo "name=demo3" > demo3/core.properties\ | |
78 | +&& echo "name=demo3" > demo3/core.properties \ | |
80 | 79 | && mv demo1 /var/solr/data/ \ |
81 | 80 | && mv demo2 /var/solr/data/ \ |
82 | 81 | && mv demo3 /var/solr/data/ |
... | ... |
src/docker/Dockerfile
... | ... | @@ -48,10 +48,9 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
48 | 48 | && sed -i '/<\/VirtualHost>/ i ProxyPass /solr http://localhost:8983/solr\nProxyPassReverse /solr http://localhost:8983/solr' /etc/apache2/sites-enabled/000-default.conf \ |
49 | 49 | && rm -rf /var/www/html/* \ |
50 | 50 | && mkdir /var/www/html/demo \ |
51 | -&& cp -rp data/folia-samples /var/www/html/demo/ \ | |
52 | -&& cp -rp data/isotei-samples /var/www/html/demo/ \ | |
51 | +&& cp -rp data/*samples /var/www/html/demo/ \ | |
53 | 52 | && gunzip -r /var/www/html/demo \ |
54 | -&& cp -rp data/site/* /var/www/html/ \ | |
53 | +&& cp -rp data/site/* /var/www/html \ | |
55 | 54 | && chmod -R 755 /var/www/html \ |
56 | 55 | && printf "echo\n" >> /start.sh \ |
57 | 56 | && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \ |
... | ... | @@ -73,10 +72,10 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
73 | 72 | && chmod -R 777 demo1 \ |
74 | 73 | && cp -rp demo1 demo2 \ |
75 | 74 | && cp data/schemaFull.xml demo2/conf/schema.xml \ |
76 | -&& echo "name=demo2" > demo2/core.properties\ | |
75 | +&& echo "name=demo2" > demo2/core.properties \ | |
77 | 76 | && cp -rp demo1 demo3 \ |
78 | 77 | && cp data/schemaFull.xml demo3/conf/schema.xml \ |
79 | -&& echo "name=demo3" > demo3/core.properties\ | |
78 | +&& echo "name=demo3" > demo3/core.properties \ | |
80 | 79 | && mv demo1 /var/solr/data/ \ |
81 | 80 | && mv demo2 /var/solr/data/ \ |
82 | 81 | && mv demo3 /var/solr/data/ |
... | ... |