Commit feb8061bf3c7935c425029af9006b79839795944
1 parent
08fd520f
release dockerfile
Showing
6 changed files
with
37 additions
and
9 deletions
README.md
1 | 1 | # Multi Tier Annotation Search |
2 | 2 | |
3 | 3 | See [meertensinstituut.github.io/mtas/](https://meertensinstituut.github.io/mtas/) |
4 | + | |
5 | +Or try the docker image providing a demonstration | |
6 | +scenario with indexing and querying of some sample documents. | |
7 | + | |
8 | +```console | |
9 | +docker build -t mtas https://raw.githubusercontent.com/meertensinstituut/mtas/master/docker/Dockerfile | |
10 | +docker run -t -i -p 8080:80 --name mtas mtas | |
11 | +``` | |
... | ... |
docker/Dockerfile
1 | 1 | # Automatically generated Dockerfile |
2 | -# - Build 2016-11-07 18:42 | |
2 | +# - Build 2016-11-09 07:38 | |
3 | 3 | # - Lucene/Solr version 6.2.0 |
4 | -# - Mtas release 20161027 | |
4 | +# - Mtas release 20161109 | |
5 | 5 | # |
6 | 6 | |
7 | 7 | FROM ubuntu:16.04 |
... | ... | @@ -15,7 +15,7 @@ WORKDIR "/root" |
15 | 15 | |
16 | 16 | RUN mkdir lib |
17 | 17 | |
18 | -ADD https://github.com/meertensinstituut/mtas/releases/download/20161027/mtas-6.2.0.jar /root/lib/ | |
18 | +ADD https://github.com/meertensinstituut/mtas/releases/download/20161109/mtas-6.2.0.jar /root/lib/ | |
19 | 19 | |
20 | 20 | RUN apt-get update && apt-get install -y lsof software-properties-common python-software-properties apache2 curl subversion \ |
21 | 21 | && solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/6.2.0/solr-6.2.0.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \ |
... | ... | @@ -51,9 +51,9 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
51 | 51 | && chmod -R 755 /var/www/html \ |
52 | 52 | && printf "echo\n" >> /start.sh \ |
53 | 53 | && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \ |
54 | -&& printf "echo \" Version 2016-11-07 18:42\"\n" >> /start.sh \ | |
54 | +&& printf "echo \" Timestamp 2016-11-09 07:38\"\n" >> /start.sh \ | |
55 | 55 | && printf "echo \" Lucene/Solr version 6.2.0\"\n" >> /start.sh \ |
56 | -&& printf "echo \" Mtas release 20161027\"\n" >> /start.sh \ | |
56 | +&& printf "echo \" Mtas release 20161109\"\n" >> /start.sh \ | |
57 | 57 | && printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \ |
58 | 58 | && printf "echo \"=======================================================================\"\n" >> /start.sh \ |
59 | 59 | && printf "echo\n" >> /start.sh \ |
... | ... |
pom.xml
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> |
6 | 6 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
7 | 7 | <currentDevelopmentVersion>6.2.0</currentDevelopmentVersion> |
8 | - <currentDevelopmentRelease>20161027</currentDevelopmentRelease> | |
8 | + <currentDevelopmentRelease>20161109</currentDevelopmentRelease> | |
9 | 9 | </properties> |
10 | 10 | <modelVersion>4.0.0</modelVersion> |
11 | 11 | <groupId>dev.meertens.mtas</groupId> |
... | ... |
src/docker/Dockerfile
... | ... | @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
51 | 51 | && chmod -R 755 /var/www/html \ |
52 | 52 | && printf "echo\n" >> /start.sh \ |
53 | 53 | && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \ |
54 | -&& printf "echo \" Version ${timestamp}\"\n" >> /start.sh \ | |
54 | +&& printf "echo \" Timestamp ${timestamp}\"\n" >> /start.sh \ | |
55 | 55 | && printf "echo \" Lucene/Solr version ${currentDevelopmentVersion}\"\n" >> /start.sh \ |
56 | 56 | && printf "echo \" Mtas release ${currentDevelopmentRelease}\"\n" >> /start.sh \ |
57 | 57 | && printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \ |
... | ... |
src/site/markdown/installation_docker.md.vm
... | ... | @@ -4,4 +4,24 @@ |
4 | 4 | #set($h4 = '####') |
5 | 5 | $h1 Mtas and Docker |
6 | 6 | |
7 | -Todo | |
8 | 7 | \ No newline at end of file |
8 | +A [Dockerfile](https://www.docker.com/) is available to get started quickly with | |
9 | +Mtas on a Solr based installation. | |
10 | + | |
11 | +To build the image | |
12 | + | |
13 | +```console | |
14 | +docker build -t mtas https://raw.githubusercontent.com/meertensinstituut/mtas/master/docker/Dockerfile | |
15 | +``` | |
16 | + | |
17 | +And to run the created image | |
18 | + | |
19 | +```console | |
20 | +docker run -t -i -p 8080:80 --name mtas mtas | |
21 | +``` | |
22 | + | |
23 | +This wil make a site available on port 8080 from your docker host ip, | |
24 | +containing access to the running solr instance and providing a demonstration | |
25 | +scenario with indexing and querying of some sample documents. | |
26 | + | |
27 | + | |
28 | + | |
... | ... |
src/site/markdown/installation_solr.md.vm
... | ... | @@ -114,7 +114,7 @@ has an attribute `configFile` containing the name of the required tokenizer conf |
114 | 114 | The filter in the query analyzer contains an obligatory attribute `prefix` defining the |
115 | 115 | assumed prefix when this field will be queried directly within Solr. |
116 | 116 | |
117 | -See [Indexing configuration](indexing_configuration.html) for morte information about | |
117 | +See [configuration](indexing_configuration.html) for more information about | |
118 | 118 | the definition of a tokenizer configuration. |
119 | 119 | |
120 | 120 | **Multiple tokenize configurations** |
... | ... |