bump to 6.3

ensure it never expands to /

3 files changed, 15 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index 81c855c..f138778 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,25 @@
 FROM openjdk:slim
 
-ARG VERSION=5.7
+ARG VERSION=6.3
 
+SHELL ["/bin/bash", "-eufo", "pipefail", "-c"]
+
+# hadolint ignore=DL3008
 RUN apt-get update && \
-    apt-get install -y \
+    apt-get upgrade -y && \
+    apt-get install --no-install-recommends -y \
         curl \
         libarchive-tools && \
+    curl --progress-bar "https://languagetool.org/download/LanguageTool-$VERSION.zip" |\
+      bsdtar -x -f - && \
     rm -rf /var/lib/apt/lists/*
 
-RUN curl --progress-bar "https://languagetool.org/download/LanguageTool-$VERSION.zip" |\
-    bsdtar -x -f -
-
 RUN adduser \
   --home /LanguageTool-$VERSION \
   --no-create-home languagetool
 
-ADD --chown=languagetool misc/init.sh /
-ADD --chown=languagetool misc/ngram.sh /
+COPY --chown=languagetool misc/init.sh /
+COPY --chown=languagetool misc/ngram.sh /
 
 WORKDIR /LanguageTool-$VERSION
 HEALTHCHECK --timeout=10s --start-period=5s \
diff --git a/misc/init.sh b/misc/init.sh
index dae150a..dc979c9 100644
--- a/misc/init.sh
+++ b/misc/init.sh
@@ -15,12 +15,12 @@ for var in ${!LT_*}; do
   echo "${var#'LT_'}="${!var} >> /tmp/config.properties
 done
 
-echo JAVAOPTIONS=$JAVAOPTIONS
+echo "JAVAOPTIONS=$JAVAOPTIONS"
 if [ "$EXTRA_LT" = true ]; then
   EXTRAOPTIONS="${EXTRAOPTIONS} --config /tmp/config.properties"
     echo config.properties:
-    echo "$(cat /tmp/config.properties)"
+    cat /tmp/config.properties
 fi
-echo EXTRAOPTIONS=$EXTRAOPTIONS
+echo "EXTRAOPTIONS=$EXTRAOPTIONS"
 
 java ${JAVAOPTIONS} -cp languagetool-server.jar org.languagetool.server.HTTPServer --port 8010 --public --allow-origin '*' ${EXTRAOPTIONS}
diff --git a/misc/ngram.sh b/misc/ngram.sh
index ce25a49..30c1671 100755
--- a/misc/ngram.sh
+++ b/misc/ngram.sh
@@ -14,7 +14,7 @@ download_ngram() {
   local directory=$3
 
   echo "Downloading: ${lang} - ${version}"
-  rm -rf "${directory}/${lang}"
+  rm -rf "${directory:?}/${lang}"
   curl --progress-bar "${NGRAM_DATA_URL}ngrams-${lang}-${version}.zip" |\
     bsdtar -x -f - -C "${directory}"
 }
@@ -54,6 +54,6 @@ for i in $(ls -d "${TARGET_DIR}"/*/); do
     fi
   done
   if [ "${delete}" == "yes" ]; then
-    rm -rf "${TARGET_DIR}/${realdir}"
+    rm -rf "${TARGET_DIR:?}/${realdir}"
   fi
 done