fix dockerfile

luigi311 · Jul 10, 2021 · a42fb91 · a42fb91
1 parent f3a505b
commit a42fb91
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 30 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,12 @@
+.DS_Store
+target/
+.vscode/
+.env
+.idea/
+mangas/
+config.yml
+*.db
+*.db-shm
+*.db-wal
+tanoshi-web/node_modules/
+.github/
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -13,42 +13,45 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install deps
+        run: sudo apt update && sudo apt install -y libssl-dev libarchive-dev build-essential cmake llvm clang libicu-dev nettle-dev libacl1-dev liblzma-dev libzstd-dev liblz4-dev libbz2-dev zlib1g-dev libxml2-dev
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
         run: cd $GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
-      - name: Install libarchive
-        run: sudo apt update && sudo apt install -y libarchive-dev nettle-dev libacl1-dev libzstd-dev liblz4-dev  
       - name: Build Backend
-        run: cd /home/runner/work/tanoshi/tanoshi/tanoshi && LIBARCHIVE_STATIC=1 cargo build -p tanoshi
+        run: cd /home/runner/work/tanoshi/tanoshi/tanoshi &&cargo build -p tanoshi
   build-macos:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install deps
+        run: brew install icu4c libarchive bzip2 lz4 zlib expat
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
         run: cd $GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
-      - name: Install libarchive
-        run: brew install libarchive pkg-config
       - name: Build Backend
         run: |
-          export LDFLAGS="-L/usr/local/opt/libarchive/lib"
-          export CPPFLAGS="-I/usr/local/opt/libarchive/include"
-          export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig"
-          cd $GITHUB_WORKSPACE/tanoshi && LIBARCHIVE_STATIC=1 cargo build -p tanoshi
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig"
+          cd $GITHUB_WORKSPACE/tanoshi && cargo build -p tanoshi
   build-windows:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "12.0"
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
-        run: cd $Env:GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
+        run: cd $env:GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
       - name: Install libarchive
         run: |
           vcpkg integrate install
-          vcpkg install --only-downloads libarchive:x64-windows-static-md
           vcpkg install libarchive:x64-windows-static-md
       - name: Build Backend
-        run: cd $Env:GITHUB_WORKSPACE\tanoshi && cargo build -p tanoshi
+        run: |
+          $env:LIBCLANG_PATH="C:\Program Files\LLVM\bin"
+          cd $env:GITHUB_WORKSPACE\tanoshi && cargo build -p tanoshi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,14 +26,14 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v2
+      - name: Install libarchive
+        run: sudo apt update && sudo apt install -y libssl-dev libarchive-dev build-essential cmake llvm clang libicu-dev nettle-dev libacl1-dev liblzma-dev libzstd-dev liblz4-dev libbz2-dev zlib1g-dev libxml2-dev
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
         run: cd $GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
-      - name: Install libarchive
-        run: sudo apt update && sudo apt install -y libarchive-dev nettle-dev libacl1-dev libzstd-dev liblz4-dev  
       - name: Build Backend
-        run: cd /home/runner/work/tanoshi/tanoshi/tanoshi && LIBARCHIVE_STATIC=1 cargo build -p tanoshi --release
+        run: cd /home/runner/work/tanoshi/tanoshi/tanoshi && cargo build -p tanoshi --release
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
@@ -49,18 +49,16 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v2
+      - name: Install deps
+        run: brew install icu4c libarchive bzip2 lz4 zlib expat
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
         run: cd $GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
-      - name: Install libarchive
-        run: brew install libarchive pkg-config
       - name: Build Backend
         run: |
-          export LDFLAGS="-L/usr/local/opt/libarchive/lib"
-          export CPPFLAGS="-I/usr/local/opt/libarchive/include"
-          export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig"
-          cd $GITHUB_WORKSPACE/tanoshi && LIBARCHIVE_STATIC=1 cargo build -p tanoshi --release
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig"
+          cd $GITHUB_WORKSPACE/tanoshi && cargo build -p tanoshi --release
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
@@ -76,17 +74,22 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v2
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v1
+        with:
+          version: "12.0"
       - name: Install wasm-pack
         run: cargo install wasm-bindgen-cli wasm-pack
       - name: Build Frontend
-        run: cd $Env:GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
+        run: cd $env:GITHUB_WORKSPACE/tanoshi-web && yarn install && yarn build
       - name: Install libarchive
         run: |
           vcpkg integrate install
-          vcpkg install --only-downloads libarchive:x64-windows-static-md
           vcpkg install libarchive:x64-windows-static-md
       - name: Build Backend
-        run: cd $Env:GITHUB_WORKSPACE\tanoshi && cargo build -p tanoshi --release
+        run: |
+          $env:LIBCLANG_PATH="C:\Program Files\LLVM\bin"
+          cd $env:GITHUB_WORKSPACE\tanoshi && cargo build -p tanoshi --release
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,27 @@
-FROM rust:bullseye AS builder
+FROM rust:latest AS builder
 
 WORKDIR /app
 
 RUN apt install -y curl
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt upgrade -y && apt-get install -y nodejs libssl-dev libarchive-dev build-essential cmake
+RUN apt upgrade -y && \
+    apt-get install -y \
+    nodejs \
+    libssl-dev \
+    libarchive-dev \
+    build-essential \
+    cmake \
+    llvm \
+    clang \
+    libicu-dev \
+    nettle-dev \
+    libacl1-dev \
+    liblzma-dev \
+    libzstd-dev \
+    liblz4-dev \
+    libbz2-dev \
+    zlib1g-dev \
+    libxml2-dev
 RUN npm install -g yarn
 
 COPY . .
@@ -13,11 +30,11 @@ RUN cargo install wasm-bindgen-cli wasm-pack
 RUN cd /app/tanoshi-web && yarn install && yarn build
 RUN cd /app/tanoshi && cargo build -p tanoshi --release
 
-FROM debian:bullseye-slim
+FROM debian:buster-slim
 
 WORKDIR /app
 
-COPY --from=builder /app/tanoshi/target/release/tanoshi .
+COPY --from=builder /app/target/release/tanoshi .
 RUN chmod +x tanoshi
 
 RUN apt update && apt upgrade -y && apt install --reinstall -y ca-certificates