From a1d31979a39455eb8d89b74804a755541cbd94eb Mon Sep 17 00:00:00 2001 From: Silvio Fricke Date: Fri, 30 Mar 2018 09:56:44 +0200 Subject: Dockerfile: reorganize dockerfile Moved download of zip file after installation of OS tools. Signed-off-by: Silvio Fricke --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 57fe510..753aed0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,6 @@ FROM debian:jessie MAINTAINER Silvio Fricke -ENV VERSION 4.0 -ADD https://www.languagetool.org/download/LanguageTool-$VERSION.zip /LanguageTool-$VERSION.zip - RUN set -ex \ && mkdir -p /uploads /etc/apt/sources.list.d /var/cache/apt/archives/ \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie.backports.list \ @@ -13,8 +10,12 @@ RUN set -ex \ && apt-get update -y \ && apt-get -t jessie-backports install -y \ openjdk-8-jre-headless \ - unzip \ - && unzip LanguageTool-$VERSION.zip \ + unzip + +ENV VERSION 4.0 +ADD https://www.languagetool.org/download/LanguageTool-$VERSION.zip /LanguageTool-$VERSION.zip + +RUN unzip LanguageTool-$VERSION.zip \ && rm LanguageTool-$VERSION.zip WORKDIR /LanguageTool-$VERSION -- cgit v1.2.3 From 8e04062bce63991b5652538a721d1d50a46fe439 Mon Sep 17 00:00:00 2001 From: Silvio Fricke Date: Fri, 30 Mar 2018 09:58:06 +0200 Subject: Dockerfile: use spaces instead tabs Signed-off-by: Silvio Fricke --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 753aed0..f983d9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,8 @@ RUN set -ex \ && apt-get clean \ && apt-get update -y \ && apt-get -t jessie-backports install -y \ - openjdk-8-jre-headless \ - unzip + openjdk-8-jre-headless \ + unzip ENV VERSION 4.0 ADD https://www.languagetool.org/download/LanguageTool-$VERSION.zip /LanguageTool-$VERSION.zip -- cgit v1.2.3 From e56aad049aa38acbaa0288e9814eb303658a28ce Mon Sep 17 00:00:00 2001 From: Silvio Fricke Date: Fri, 30 Mar 2018 09:58:46 +0200 Subject: Dockerfile: add bash in preparation of ngram support Signed-off-by: Silvio Fricke --- Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index f983d9e..0e7be21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ && apt-get clean \ && apt-get update -y \ && apt-get -t jessie-backports install -y \ + bash \ openjdk-8-jre-headless \ unzip -- cgit v1.2.3 From 475a9850d04d39b38d365ef008cc29c779cd64cb Mon Sep 17 00:00:00 2001 From: Silvio Fricke Date: Fri, 30 Mar 2018 10:00:35 +0200 Subject: Dockerfile: move startparameter to a own script This is for preparation of supporting of ngrams. Signed-off-by: Silvio Fricke --- Dockerfile | 5 ++++- misc/start.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 misc/start.sh (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 0e7be21..f2bc776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,5 +21,8 @@ RUN unzip LanguageTool-$VERSION.zip \ WORKDIR /LanguageTool-$VERSION -CMD ["java", "-cp", "languagetool-server.jar", "org.languagetool.server.HTTPServer", "--port", "8010", "--public", "--allow-origin", "'*'"] +ADD misc/start.sh /start.sh +RUN chmod a+x /start.sh + +CMD [ "/start.sh" ] EXPOSE 8010 diff --git a/misc/start.sh b/misc/start.sh new file mode 100644 index 0000000..8f3e05e --- /dev/null +++ b/misc/start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +java -cp languagetool-server.jar org.languagetool.server.HTTPServer --port 8010 --public --allow-origin '*' -- cgit v1.2.3 From 48b78a322c90dd726d1a2295119bfc0bf7b9621a Mon Sep 17 00:00:00 2001 From: Silvio Fricke Date: Fri, 30 Mar 2018 10:12:33 +0200 Subject: Update Version to 4.1 Signed-off-by: Silvio Fricke --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index f2bc776..a7925c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN set -ex \ openjdk-8-jre-headless \ unzip -ENV VERSION 4.0 +ENV VERSION 4.1 ADD https://www.languagetool.org/download/LanguageTool-$VERSION.zip /LanguageTool-$VERSION.zip RUN unzip LanguageTool-$VERSION.zip \ -- cgit v1.2.3