Merge pull request #214 from g0ldyy/master

feat: optimized Dockerfile

docker/Dockerfile

@@ -1,55 +1,76 @@
 # Build rust stage
 FROM rust:bookworm AS rust-build
 
+# Get target architecture
+ARG RUST_TARGET
+
 RUN apt-get update && apt-get install -y --no-install-recommends pkg-config musl-tools libssl-dev
 
 # Update Rust toolchain and add necessary target
-RUN rustup update && rustup target add x86_64-unknown-linux-musl
+RUN rustup update && rustup target add $RUST_TARGET
 
 # Set Rust compiler flags for better optimization and reproducibility
 ENV RUSTFLAGS='--remap-path-prefix $HOME=~ -C target-feature=+crt-static'
 
-# Copy the actual source code and build the project
+# Copy only Cargo.toml and Cargo.lock for dependency caching
 WORKDIR /src
-COPY . /src
-RUN cargo build --target x86_64-unknown-linux-musl --release
+COPY Cargo.toml Cargo.lock ./
+
+# Create a dummy src/main.rs to build dependencies only
+RUN mkdir src && echo "fn main() {}" > src/main.rs
+RUN cargo build --target $RUST_TARGET --release || true
+
+# Now copy the actual source code and build the project
+COPY . .
+RUN cargo build --target $RUST_TARGET --release
 
 # Build node stage
 FROM node:lts AS node-build
 
 ENV NODE_OPTIONS=--openssl-legacy-provider
 
-COPY ./frontend /app
 WORKDIR /app
 
-RUN yarn install --prefer-offline --frozen-lockfile --non-interactive --production=false && \
-    yarn build &&  rm -rf node_modules
+# Copy package.json files first for better caching
+COPY ./frontend/package.json ./
+
+# Install dependencies
+RUN yarn install --prefer-offline --non-interactive --production=false
+
+# Copy the rest of the frontend code
+COPY ./frontend /app
+
+# Build the frontend
+RUN yarn build && rm -rf node_modules
 
 # Build resource stage (using ffmpeg)
-FROM jrottenberg/ffmpeg:latest AS resource-build
+FROM linuxserver/ffmpeg:latest AS resource-build
 WORKDIR /src
 COPY resources ./resources
-RUN ffmpeg -loop 1 -i ./resources/channel_unavailable.jpg -t 10 -r 1 -an \
-  -vf "scale=1920:1080" \
-  -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
-  ./resources/channel_unavailable.ts
 
-RUN ffmpeg -loop 1 -i ./resources/user_connections_exhausted.jpg -t 10 -r 1 -an \
-  -vf "scale=1920:1080" \
-  -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
-  ./resources/user_connections_exhausted.ts
-  
-RUN ffmpeg -loop 1 -i ./resources/provider_connections_exhausted.jpg -t 10 -r 1 -an \
-  -vf "scale=1920:1080" \
-  -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
-  ./resources/provider_connections_exhausted.ts
+# Combine ffmpeg commands into a single layer to reduce image size
+RUN ffmpeg -loop 1 -i ./resources/channel_unavailable.jpg -t 10 -r 1 -an \
+    -vf "scale=1920:1080" \
+    -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
+    ./resources/channel_unavailable.ts && \
+  ffmpeg -loop 1 -i ./resources/user_connections_exhausted.jpg -t 10 -r 1 -an \
+    -vf "scale=1920:1080" \
+    -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
+    ./resources/user_connections_exhausted.ts && \
+  ffmpeg -loop 1 -i ./resources/provider_connections_exhausted.jpg -t 10 -r 1 -an \
+    -vf "scale=1920:1080" \
+    -c:v libx264 -preset veryfast -crf 23 -pix_fmt yuv420p \
+    ./resources/provider_connections_exhausted.ts
 
 # Final container (Scratch)
 FROM scratch AS scratch-final
+
+ARG RUST_TARGET
+
 WORKDIR /app
 COPY --from=rust-build /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=rust-build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=rust-build /src/target/x86_64-unknown-linux-musl/release/m3u-filter ./m3u-filter
+COPY --from=rust-build /src/target/${RUST_TARGET}/release/m3u-filter ./m3u-filter
 COPY --from=node-build /app/build ./web
 COPY --from=resource-build /src/resources ./resources
 ENTRYPOINT ["/app/m3u-filter"]
@@ -57,9 +78,13 @@ CMD ["-s", "-p", "/app/config"]
 
 # Final container (Alpine)
 FROM alpine:latest AS alpine-final
+
+ARG RUST_TARGET
+
 RUN apk add --no-cache bash curl ca-certificates tini
+
 WORKDIR /app
-COPY --from=rust-build /src/target/x86_64-unknown-linux-musl/release/m3u-filter ./m3u-filter
+COPY --from=rust-build /src/target/${RUST_TARGET}/release/m3u-filter ./m3u-filter
 COPY --from=node-build /app/build ./web
 COPY --from=resource-build /src/resources ./resources
 ENTRYPOINT ["/sbin/tini", "--", "/app/m3u-filter"]

docker/README.md

@@ -2,7 +2,14 @@
 Change into the root directory and run:
 
 ```shell
-docker build --rm -f docker/Dockerfile -t m3u-filter --target scratch-final .  
+# Build for a specific architecture
+docker build --rm -f docker/Dockerfile -t m3u-filter --target scratch-final --build-arg RUST_TARGET=x86_64-unknown-linux-musl .
+
+docker build --rm -f docker/Dockerfile -t m3u-filter --target scratch-final --build-arg RUST_TARGET=aarch64-unknown-linux-musl .
+
+docker build --rm -f docker/Dockerfile -t m3u-filter --target scratch-final --build-arg RUST_TARGET=armv7-unknown-linux-musleabihf .
+
+docker build --rm -f docker/Dockerfile -t m3u-filter --target scratch-final --build-arg RUST_TARGET=x86_64-apple-darwin .
 ```
 PS: If you build `alpine-final` target be aware of the path prefix: `/app`