Merge branch 'revert-2ced12d8' into 'main'

Revert "Merge branch 'languagetool-baseimage' into 'main'"

See merge request reportcreator/reportcreator!658

languagetool/Dockerfile

@@ -1,22 +1,21 @@
-FROM elestio/languagetool:v6.4
+FROM erikvl87/languagetool:6.4
 
 # Add custom CA certificates
 ARG CA_CERTIFICATES=""
 USER root
 RUN mkdir -p /usr/local/share/ca-certificates/ && \
     echo "${CA_CERTIFICATES}" | tee -a /usr/local/share/ca-certificates/custom-user-cert.crt /etc/ssl/certs/ca-certificates.crt && \
     apk add --no-cache ca-certificates && \
-    update-ca-certificates \
+    update-ca-certificates
+
 # PostgreSQL support
-    && apk add --no-cache zip unzip wget \
-    && wget https://github.com/pgjdbc/pgjdbc/releases/download/REL42.7.3/postgresql-42.7.3.jar -P libs --quiet \
-    && wget https://github.com/pgjdbc/pgjdbc/archive/refs/tags/REL42.7.3.tar.gz -P /src --quiet \
+RUN apk add postgresql-client zip unzip wget \
+    && wget https://jdbc.postgresql.org/download/postgresql-42.7.3.jar -P libs --quiet \
     && mkdir -p org/languagetool/server \
     && unzip -p languagetool-server.jar org/languagetool/server/mybatis-config.xml | \
         sed '/^\s*<\/dataSource>/i<property name="driver.prepareThreshold" value="0"\/>' \
         > org/languagetool/server/mybatis-config.xml \
-    && zip -u languagetool-server.jar org/languagetool/server/mybatis-config.xml \
-    && apk del zip unzip wget ca-certificates
+    && zip -u languagetool-server.jar org/languagetool/server/mybatis-config.xml
 
 # Add custom wordlists
 COPY scripts/* ./