Merge 186651d into a97ec48

Dockerfile

@@ -1,35 +1,36 @@
 FROM ghcr.io/apertium/base
 LABEL maintainer sushain@skc.name
-WORKDIR /root
 
 # Install packaged dependencies
 
 RUN apt-get -qq update && apt-get -qq install \
-    apt-utils \
-    automake \
-    gcc-multilib \
-    git \
-    python \
-    python3-dev \
     python3-pip \
-    sqlite3 \
-    zlib1g-dev
+    sqlite3
 
 # Install CLD2
 
-RUN git clone https://github.com/CLD2Owners/cld2
-RUN cd /root/cld2/internal && \
+WORKDIR /root/tmp
+ADD https://github.com/CLD2Owners/cld2/archive/refs/heads/master.zip cld2.zip
+RUN unzip -q cld2.zip && \
+    mv cld2-master cld2 && \
+    cd cld2/internal && \
     CPPFLAGS='-std=c++98' ./compile_libs.sh && \
     cp *.so /usr/lib/
-RUN git clone https://github.com/mikemccand/chromium-compact-language-detector
-RUN cd /root/chromium-compact-language-detector && \
+ADD https://github.com/mikemccand/chromium-compact-language-detector/archive/refs/heads/master.zip chromium-compact-language-detector.zip
+RUN unzip -q chromium-compact-language-detector.zip && \
+    cd chromium-compact-language-detector-master && \
     python3 setup.py build && python3 setup_full.py build && \
     python3 setup.py install && python3 setup_full.py install
+WORKDIR /root
+RUN rm -rf /root/tmp
 
 # Install Apertium-related libraries (and a test pair)
 
-RUN apt-get -qq update && apt-get -qq install giella-core giella-shared hfst-ospell
-RUN apt-get -qq update && apt-get -qq install apertium-en-es
+RUN apt-get -qq update && apt-get -qq install \
+    giella-core \
+    giella-shared \
+    hfst-ospell \
+    apertium-eng-spa
 
 # Install APy
 
@@ -39,7 +40,7 @@ RUN pip3 install pipenv
 RUN cd apertium-apy && pipenv install --deploy --system
 
 COPY . apertium-apy
-RUN cd apertium-apy && make -j2
+RUN cd apertium-apy && make -j4
 
 # Run APy