diff --git a/Dockerfile.linux b/Dockerfile.linux index 5ee64c07..8561e5eb 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -130,6 +130,16 @@ RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/ make -j$THREADS install && \ rm -rf $(pwd) +RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.bz2 && \ + echo "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 expat-2.4.8.tar.bz2" | sha256sum -c && \ + tar -xf expat-2.4.8.tar.bz2 && \ + rm expat-2.4.8.tar.bz2 && \ + cd expat-2.4.8 && \ + ./configure --enable-static --disable-shared --prefix=/usr && \ + make -j$THREADS && \ + make -j$THREADS install && \ + rm -rf $(pwd) + RUN git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \ cd fontconfig && \ git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \ @@ -165,16 +175,6 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1q.tar.gz && \ make -j$THREADS install && \ rm -rf $(pwd) -RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.bz2 && \ - echo "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 expat-2.4.8.tar.bz2" | sha256sum -c && \ - tar -xf expat-2.4.8.tar.bz2 && \ - rm expat-2.4.8.tar.bz2 && \ - cd expat-2.4.8 && \ - ./configure --enable-static --disable-shared --prefix=/usr && \ - make -j$THREADS && \ - make -j$THREADS install && \ - rm -rf $(pwd) - RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.16.2.tar.gz && \ echo "2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581 unbound-1.16.2.tar.gz" | sha256sum -c && \ tar -xzf unbound-1.16.2.tar.gz && \