From 7e8f17cd8215c7b574ae13de7aef270db4a539f6 Mon Sep 17 00:00:00 2001
From: lifegpc <g1710431395@gmail.com>
Date: Fri, 6 Oct 2023 03:06:06 +0000
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 63fd208..0a32cef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,32 +21,31 @@ RUN apt update && apt install -y \
 RUN curl https://sh.rustup.rs -sSf | \
     sh -s -- --default-toolchain nightly -y
 ENV PATH=/root/.cargo/bin:$PATH
-WORKDIR /app
-COPY . /app
-ENV PREFIX=/app/clib
 RUN cd ~ && git clone --depth 1 'https://github.com/Exiv2/exiv2' \
     && cd exiv2 && mkdir -p build && cd build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. "-DCMAKE_INSTALL_PREFIX=$PREFIX" \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. "-DCMAKE_INSTALL_PREFIX=/clib" \
     -DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF \
     && make -j$(grep -c ^processor /proc/cpuinfo) && make install \
     && cd ~ && rm -rf exiv2
 RUN cd ~ && git clone --depth 1 'https://github.com/nih-at/libzip' \
     && cd libzip && mkdir -p build && cd build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. "-DCMAKE_INSTALL_PREFIX=$PREFIX" \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. "-DCMAKE_INSTALL_PREFIX=/clib" \
     && make -j$(grep -c ^processor /proc/cpuinfo) && make install \
     && cd ~ && rm -rf libzip
 RUN cd ~ && git clone --depth 1 'https://code.videolan.org/videolan/x264.git' && cd x264 \
-    && ./configure --disable-cli --enable-strip --enable-pic --enable-shared --disable-static --prefix=$PREFIX \
+    && ./configure --disable-cli --enable-strip --enable-pic --enable-shared --disable-static --prefix=/clib \
     && make -j$(grep -c ^processor /proc/cpuinfo) && make install \
     && cd ~ && rm -rf x264
 RUN cd ~ && git clone --depth 1 'https://git.ffmpeg.org/ffmpeg.git' && cd ffmpeg \
-    && ./configure --enable-shared --disable-static --enable-gpl --enable-version3 --enable-libx264 --prefix=$PREFIX \
+    && ./configure --enable-shared --disable-static --enable-gpl --enable-version3 --enable-libx264 --prefix=/clib \
     && make -j$(grep -c ^processor /proc/cpuinfo) && make install \
     && cd ~ && rm -rf ffmpeg
-RUN export PKG_CONFIG_PATH=`pwd`/clib/lib/pkgconfig \
-    && export CMAKE_PREFIX_PATH=`pwd`/clib \
-    && export "LIBRARY_PATH=$LIBRARY_PATH:`pwd`/clib/lib" \
-    && export "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/clib/lib" \
+WORKDIR /app
+COPY . /app
+RUN export PKG_CONFIG_PATH=/clib/lib/pkgconfig \
+    && export CMAKE_PREFIX_PATH=/clib \
+    && export "LIBRARY_PATH=$LIBRARY_PATH:/clib/lib" \
+    && export "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/clib/lib" \
     && cargo build --features all,docker --release
 
 FROM ubuntu:latest as prod
@@ -60,8 +59,10 @@ RUN apt update && apt install -y \
     ca-certificates
 
 COPY --from=builder /app/target/release/pixiv_downloader /app/pixiv_downloader
-COPY --from=builder /app/clib/lib /app/lib
+COPY --from=builder /clib/lib /app/lib
 ENV LD_LIBRARY_PATH=/app/lib
 
+RUN mkdir -p /app/data && mkdir -p /app/downloads && mkdir -p /app/temp
+
 ENTRYPOINT [ "/app/pixiv_downloader" ]
 CMD [ "s" ]