refactor(ci): Refactor Docker build to use base images and dynamic Dockerfile generation (#904)

2025-09-19 20:26:26 +08:00 · 2025-07-30 15:04:29 +08:00
parent 3c7b0c4999
commit 19d1a3b785
5 changed files with 31 additions and 74 deletions
--- a/.github/workflows/release_docker.yml
+++ b/.github/workflows/release_docker.yml
@ -125,15 +125,19 @@ jobs:
        image: ["latest", "ffmpeg", "aria2", "aio"]
        include:
          - image: "latest"
+            base_image_tag: "base"
            build_arg: ""
            tag_favor: ""
          - image: "ffmpeg"
+            base_image_tag: "ffmpeg"
            build_arg: INSTALL_FFMPEG=true
            tag_favor: "suffix=-ffmpeg,onlatest=true"
          - image: "aria2"
+            base_image_tag: "aria2"
            build_arg: INSTALL_ARIA2=true
            tag_favor: "suffix=-aria2,onlatest=true"
          - image: "aio"
+            base_image_tag: "aio"
            build_arg: |
              INSTALL_FFMPEG=true
              INSTALL_ARIA2=true
@ -189,7 +193,9 @@ jobs:
          context: .
          file: Dockerfile.ci
          push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: ${{ matrix.build_arg }}
+          build-args: |
+            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
+            ${{ matrix.build_arg }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          platforms: ${{ env.RELEASE_PLATFORMS }}
@ -203,15 +209,19 @@ jobs:
        image: ["latest", "ffmpeg", "aria2", "aio"]
        include:
          - image: "latest"
+            base_image_tag: "base"
            build_arg: ""
            tag_favor: "suffix=-lite,onlatest=true"
          - image: "ffmpeg"
+            base_image_tag: "ffmpeg"
            build_arg: INSTALL_FFMPEG=true
            tag_favor: "suffix=-lite-ffmpeg,onlatest=true"
          - image: "aria2"
+            base_image_tag: "aria2"
            build_arg: INSTALL_ARIA2=true
            tag_favor: "suffix=-lite-aria2,onlatest=true"
          - image: "aio"
+            base_image_tag: "aio"
            build_arg: |
              INSTALL_FFMPEG=true
              INSTALL_ARIA2=true
@ -267,7 +277,9 @@ jobs:
          context: .
          file: Dockerfile.ci
          push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: ${{ matrix.build_arg }}
+          build-args: |
+            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
+            ${{ matrix.build_arg }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ env.RELEASE_PLATFORMS }}
+          platforms: ${{ env.RELEASE_PLATFORMS }}
--- a/.github/workflows/test_docker.yml
+++ b/.github/workflows/test_docker.yml
@ -77,15 +77,19 @@ jobs:
        image: ["latest", "ffmpeg", "aria2", "aio"]
        include:
          - image: "latest"
+            base_image_tag: "base"
            build_arg: ""
            tag_favor: ""
          - image: "ffmpeg"
+            base_image_tag: "ffmpeg"
            build_arg: INSTALL_FFMPEG=true
            tag_favor: "suffix=-ffmpeg,onlatest=true"
          - image: "aria2"
+            base_image_tag: "aria2"
            build_arg: INSTALL_ARIA2=true
            tag_favor: "suffix=-aria2,onlatest=true"
          - image: "aio"
+            base_image_tag: "aio"
            build_arg: |
              INSTALL_FFMPEG=true
              INSTALL_ARIA2=true
@ -137,7 +141,9 @@ jobs:
          context: .
          file: Dockerfile.ci
          push: ${{ env.IMAGE_PUSH == 'true' }}
-          build-args: ${{ matrix.build_arg }}
+          build-args: |
+            BASE_IMAGE_TAG=${{ matrix.base_image_tag }}
+            ${{ matrix.build_arg }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          platforms: ${{ env.RELEASE_PLATFORMS }}
--- a/38
+++ b/38
@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:edge AS builder
+FROM alpine:edge AS builder
 LABEL stage=go-builder
 WORKDIR /app/
 RUN apk add --no-cache bash curl jq gcc git go musl-dev
@ -7,7 +7,9 @@ RUN go mod download
 COPY ./ ./
 RUN bash build.sh release docker

-FROM alpine:edge
+### Default image is base. You can add other support by modifying BASE_IMAGE_TAG. The following parameters are supported: base (default), aria2, ffmpeg, aio
+ARG BASE_IMAGE_TAG=base
+FROM openlistteam/openlist-base-image:${BASE_IMAGE_TAG}

 ARG INSTALL_FFMPEG=false
 ARG INSTALL_ARIA2=false
@ -15,38 +17,6 @@ LABEL MAINTAINER="OpenList"

 WORKDIR /opt/openlist/

-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash ca-certificates su-exec tzdata runit; \
-    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
-    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
-        mkdir -p /opt/aria2/.aria2 && \
-        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
-        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
-        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
-        mkdir -p /opt/service/stop/aria2/log && \
-        echo '#!/bin/sh' > /opt/service/stop/aria2/run && \
-        echo 'exec 2>&1' >> /opt/service/stop/aria2/run && \
-        echo 'exec aria2c --enable-rpc --rpc-allow-origin-all --conf-path=/opt/aria2/.aria2/aria2.conf' >> /opt/service/stop/aria2/run && \
-        echo '#!/bin/sh' > /opt/service/stop/aria2/log/run && \
-        echo 'mkdir -p /opt/openlist/data/log/aria2 2>/dev/null' >> /opt/service/stop/aria2/log/run && \
-        echo 'exec svlogd /opt/openlist/data/log/aria2' >> /opt/service/stop/aria2/log/run && \
-        chmod +x /opt/service/stop/aria2/run /opt/service/stop/aria2/log/run && \
-        touch /opt/aria2/.aria2/aria2.session && \
-        /opt/aria2/.aria2/tracker.sh ; \
-    rm -rf /var/cache/apk/*
-    
-RUN mkdir -p /opt/service/start/openlist && \
-    echo '#!/bin/sh' > /opt/service/start/openlist/run && \
-    echo 'exec 2>&1' >> /opt/service/start/openlist/run && \
-    echo 'cd /opt/openlist' >> /opt/service/start/openlist/run && \
-    echo 'exec ./openlist server --no-prefix' >> /opt/service/start/openlist/run && \
-    chmod +x /opt/service/start/openlist/run
-
 COPY --chmod=755 --from=builder /app/bin/openlist ./
 COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@ -1,4 +1,5 @@
-FROM docker.io/library/alpine:edge
+ARG BASE_IMAGE_TAG=base
+FROM ghcr.io/openlistteam/openlist-base-image:${BASE_IMAGE_TAG}

 ARG TARGETPLATFORM
 ARG INSTALL_FFMPEG=false
@ -7,38 +8,6 @@ LABEL MAINTAINER="OpenList"

 WORKDIR /opt/openlist/

-RUN apk update && \
-    apk upgrade --no-cache && \
-    apk add --no-cache bash ca-certificates su-exec tzdata runit; \
-    [ "$INSTALL_FFMPEG" = "true" ] && apk add --no-cache ffmpeg; \
-    [ "$INSTALL_ARIA2" = "true" ] && apk add --no-cache curl aria2 && \
-        mkdir -p /opt/aria2/.aria2 && \
-        wget https://github.com/P3TERX/aria2.conf/archive/refs/heads/master.tar.gz -O /tmp/aria-conf.tar.gz && \
-        tar -zxvf /tmp/aria-conf.tar.gz -C /opt/aria2/.aria2 --strip-components=1 && rm -f /tmp/aria-conf.tar.gz && \
-        sed -i 's|rpc-secret|#rpc-secret|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root/.aria2|/opt/aria2/.aria2|g' /opt/aria2/.aria2/script.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/aria2.conf && \
-        sed -i 's|/root|/opt/aria2|g' /opt/aria2/.aria2/script.conf && \
-        mkdir -p /opt/service/stop/aria2/log && \
-        echo '#!/bin/sh' > /opt/service/stop/aria2/run && \
-        echo 'exec 2>&1' >> /opt/service/stop/aria2/run && \
-        echo 'exec aria2c --enable-rpc --rpc-allow-origin-all --conf-path=/opt/aria2/.aria2/aria2.conf' >> /opt/service/stop/aria2/run && \
-        echo '#!/bin/sh' > /opt/service/stop/aria2/log/run && \
-        echo 'mkdir -p /opt/openlist/data/log/aria2 2>/dev/null' >> /opt/service/stop/aria2/log/run && \
-        echo 'exec svlogd /opt/openlist/data/log/aria2' >> /opt/service/stop/aria2/log/run && \
-        chmod +x /opt/service/stop/aria2/run /opt/service/stop/aria2/log/run && \
-        touch /opt/aria2/.aria2/aria2.session && \
-        /opt/aria2/.aria2/tracker.sh ; \
-    rm -rf /var/cache/apk/*
-    
-RUN mkdir -p /opt/service/start/openlist && \
-    echo '#!/bin/sh' > /opt/service/start/openlist/run && \
-    echo 'exec 2>&1' >> /opt/service/start/openlist/run && \
-    echo 'cd /opt/openlist' >> /opt/service/start/openlist/run && \
-    echo 'exec ./openlist server --no-prefix' >> /opt/service/start/openlist/run && \
-    chmod +x /opt/service/start/openlist/run
-
 COPY --chmod=755 /build/${TARGETPLATFORM}/openlist ./
 COPY --chmod=755 entrypoint.sh /entrypoint.sh
 RUN /entrypoint.sh version
--- a/build.sh
+++ b/build.sh
@ -164,7 +164,7 @@ BuildDocker() {
 PrepareBuildDockerMusl() {
  mkdir -p build/musl-libs
  BASE="https://github.com/OpenListTeam/musl-compilers/releases/latest/download/"
-  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross s390x-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross)
+  FILES=(x86_64-linux-musl-cross aarch64-linux-musl-cross i486-linux-musl-cross armv6-linux-musleabihf-cross armv7l-linux-musleabihf-cross riscv64-linux-musl-cross powerpc64le-linux-musl-cross) ## Disable s390x-linux-musl-cross builds
  for i in "${FILES[@]}"; do
    url="${BASE}${i}.tgz"
    lib_tgz="build/${i}.tgz"
@ -183,8 +183,8 @@ BuildDockerMultiplatform() {
  docker_lflags="--extldflags '-static -fpic' $ldflags"
  export CGO_ENABLED=1

-  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-s390x linux-riscv64 linux-ppc64le)
-  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc s390x-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc)
+  OS_ARCHES=(linux-amd64 linux-arm64 linux-386 linux-riscv64 linux-ppc64le) ## Disable linux-s390x builds
+  CGO_ARGS=(x86_64-linux-musl-gcc aarch64-linux-musl-gcc i486-linux-musl-gcc riscv64-linux-musl-gcc powerpc64le-linux-musl-gcc) ## Disable s390x-linux-musl-gcc builds
  for i in "${!OS_ARCHES[@]}"; do
    os_arch=${OS_ARCHES[$i]}
    cgo_cc=${CGO_ARGS[$i]}