Commit bbd39cf94195b543ee5fbe3d193e193419d74c6c
1 parent
ef6c60dc
fix docker
Showing
2 changed files
with
6 additions
and
6 deletions
docker/Dockerfile
... | ... | @@ -47,8 +47,8 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
47 | 47 | && a2enconf fqdn \ |
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 | -&& mkdir /var/www/html/demo \ | |
51 | -&& cp -rp data/*samples /var/www/html/demo/ \ | |
50 | +&& mkdir /var/www/html/demo \ | |
51 | +&& cp -rp data/*-samples /var/www/html/demo/ \ | |
52 | 52 | && gunzip -r /var/www/html/demo \ |
53 | 53 | && cp -rp data/site/* /var/www/html \ |
54 | 54 | && chmod -R 755 /var/www/html \ |
... | ... | @@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
68 | 68 | && cp lib/mtas-6.3.0.jar demo1/lib/ \ |
69 | 69 | && cp data/solrconfig.xml demo1/conf/ \ |
70 | 70 | && cp data/schemaBasic.xml demo1/conf/schema.xml \ |
71 | -&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \ | |
71 | +&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \ | |
72 | 72 | && chmod -R 777 demo1 \ |
73 | 73 | && cp -rp demo1 demo2 \ |
74 | 74 | && cp data/schemaFull.xml demo2/conf/schema.xml \ |
... | ... |
src/docker/Dockerfile
... | ... | @@ -47,8 +47,8 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
47 | 47 | && a2enconf fqdn \ |
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 | -&& mkdir /var/www/html/demo \ | |
51 | -&& cp -rp data/*samples /var/www/html/demo/ \ | |
50 | +&& mkdir /var/www/html/demo \ | |
51 | +&& cp -rp data/*-samples /var/www/html/demo/ \ | |
52 | 52 | && gunzip -r /var/www/html/demo \ |
53 | 53 | && cp -rp data/site/* /var/www/html \ |
54 | 54 | && chmod -R 755 /var/www/html \ |
... | ... | @@ -68,7 +68,7 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
68 | 68 | && cp lib/mtas-${currentDevelopmentVersion}.jar demo1/lib/ \ |
69 | 69 | && cp data/solrconfig.xml demo1/conf/ \ |
70 | 70 | && cp data/schemaBasic.xml demo1/conf/schema.xml \ |
71 | -&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \ | |
71 | +&& cp -r data/mtas demo1/conf/ && cp data/mtas.xml demo1/conf/ \ | |
72 | 72 | && chmod -R 777 demo1 \ |
73 | 73 | && cp -rp demo1 demo2 \ |
74 | 74 | && cp data/schemaFull.xml demo2/conf/schema.xml \ |
... | ... |