Docker: Use curl static binary

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

.ffmpeg/Dockerfile

@@ -1,9 +1,8 @@
+FROM rclone/rclone:beta AS rclone
 FROM ubuntu:noble AS builder
 ARG FFMPEG_VERSION="7.1"
 ARG RCLONE_VER="v1.69.1"
 ARG GO_VERSION="latest"
-ARG GO_CRYPTO_VERSION="v0.35.0"
-ARG GO_OAUTH2_VERSION="v0.27.0"
 
 USER root
 
@@ -20,33 +19,15 @@ RUN apt-get update -qqy \
     && apt-get -qyy clean \
     && mkdir -p /usr/local/src
 
-RUN if [ "${GO_VERSION}" = "latest" ]; then \
-        GO_VERSION=$(curl -sk https://go.dev/dl/?mode=json | jq -r '.[0].version'); \
-    fi \
-    && curl -skLO https://go.dev/dl/${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz \
-    && tar -xf ${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz -C /usr/local \
-    && rm -rf ${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz* \
-    && ln -sf /usr/local/go/bin/go /usr/bin/go \
-    && go version
+COPY --from=rclone /usr/local/bin/rclone /usr/local/bin/rclone
 
-RUN cd /usr/local/src \
-    && git clone https://github.com/rclone/rclone.git \
-    && cd rclone \
-    && git checkout ${RCLONE_VER} \
-    # Patch deps version in go.mod to fix CVEs
-    && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
-    && sed -i "s|golang.org/x/oauth2 v.*|golang.org/x/oauth2 ${GO_OAUTH2_VERSION}|g" go.mod \
-    && go mod tidy \
-    # Build rclone
-    && make \
-    && mv ~/go/bin/rclone /usr/local/bin/ \
-    && rclone version
+RUN rclone --version
 
 #======================================
 # Install x264 from source
 #======================================
 RUN cd /usr/local/src \
-    && git clone https://code.videolan.org/videolan/x264.git \
+    && git clone https://code.videolan.org/videolan/x264.git --filter=blob:none \
     && cd x264 \
     && ./configure --prefix="/usr/local" --enable-static \
     && make \
@@ -56,9 +37,9 @@ RUN cd /usr/local/src \
 # Install FFmpeg from source
 #======================================
 RUN cd /usr/local/src \
-    && git clone https://github.com/FFmpeg/FFmpeg.git \
+    && git clone https://github.com/FFmpeg/FFmpeg.git --filter=blob:none \
     && cd FFmpeg \
-    && git checkout release/${FFMPEG_VERSION} \
+    && git checkout n${FFMPEG_VERSION} \
     && rm -rf .git \
     && PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" FFMPEG_VERSION=${FFMPEG_VERSION} ./configure \
     --prefix="/usr/local" \

Base/Dockerfile

@@ -45,6 +45,11 @@ ENV DEBIAN_FRONTEND=noninteractive \
 # Miscellaneous packages
 # Includes minimal runtime used for executing non GUI Java programs
 #========================
+RUN echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" > /etc/apt/sources.list \
+    && echo "deb-src [arch=amd64] http://archive.ubuntu.com/ubuntu noble main restricted universe multiverse\n" >> /etc/apt/sources.list \
+    && echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list \
+    && echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" >> /etc/apt/sources.list
+
 RUN apt-get -qqy update \
   && apt-get upgrade -yq \
   && apt-get -qqy --no-install-recommends install \
@@ -56,14 +61,18 @@ RUN apt-get -qqy update \
     unzip \
     wget \
     jq \
-    curl \
     supervisor \
     gnupg2 \
     libnss3-tools \
     openjdk-${JRE_VERSION}-jdk-headless \
     ca-certificates \
   && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+RUN ARCH=$(if [ "$(dpkg --print-architecture)" = "arm64" ]; then echo "aarch64"; else echo "$(dpkg --print-architecture)"; fi) \
+    && wget -q https://github.com/moparisthebest/static-curl/releases/download/v8.11.0/curl-$ARCH -O /usr/bin/curl \
+    && chmod +x /usr/bin/curl \
+    && curl --version
+
 RUN --mount=type=secret,id=SEL_PASSWD \
     if [ "${TARGETARCH}" = "arm" ] && [ "${TARGETVARIANT}" = "v7" ]; then \
        export ARCH=armhf ; \