Commit b072b21a5a19ca8edef872b8b1f56117a07e48ce
1 parent
8bc61486
fix utf8-problem docker
Showing
2 changed files
with
4 additions
and
2 deletions
docker/Dockerfile
1 | 1 | # Automatically generated Dockerfile |
2 | -# - Build 2016-12-31 13:01 | |
2 | +# - Build 2017-01-02 07:18 | |
3 | 3 | # - Lucene/Solr version 6.3.0 |
4 | 4 | # - Mtas release 20161230 |
5 | 5 | # |
... | ... | @@ -18,6 +18,7 @@ RUN mkdir lib |
18 | 18 | ADD https://github.com/meertensinstituut/mtas/releases/download/20161230/mtas-6.3.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 | +&& locale-gen en_US.UTF-8 en_US && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en \ | |
21 | 22 | && solrurl=$(curl -s 'http://www.apache.org/dyn/closer.lua/lucene/solr/6.3.0/solr-6.3.0.tgz' | grep -o '<strong>[^<]*</strong>' | sed 's/<[^>]*>//g' | head -1) \ |
22 | 23 | && curl -o /root/solr-6.3.0.tgz -O $solrurl \ |
23 | 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) \ |
... | ... | @@ -54,7 +55,7 @@ RUN apt-get update && apt-get install -y lsof software-properties-common python- |
54 | 55 | && chmod -R 755 /var/www/html \ |
55 | 56 | && printf "echo\n" >> /start.sh \ |
56 | 57 | && printf "echo \"================ Mtas -- Multi Tier Annotation Search =================\"\n" >> /start.sh \ |
57 | -&& printf "echo \" Timestamp 2016-12-31 13:01\"\n" >> /start.sh \ | |
58 | +&& printf "echo \" Timestamp 2017-01-02 07:18\"\n" >> /start.sh \ | |
58 | 59 | && printf "echo \" Lucene/Solr version 6.3.0\"\n" >> /start.sh \ |
59 | 60 | && printf "echo \" Mtas release 20161230\"\n" >> /start.sh \ |
60 | 61 | && printf "echo \" See https://meertensinstituut.github.io/mtas/ for more information\"\n" >> /start.sh \ |
... | ... |
src/docker/Dockerfile
... | ... | @@ -18,6 +18,7 @@ RUN mkdir lib |
18 | 18 | ADD https://github.com/meertensinstituut/mtas/releases/download/${currentDevelopmentRelease}/mtas-${currentDevelopmentVersion}.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 | +&& locale-gen en_US.UTF-8 en_US && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en \ | |
21 | 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) \ |
22 | 23 | && curl -o /root/solr-${currentDevelopmentVersion}.tgz -O $solrurl \ |
23 | 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) \ |
... | ... |