Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build-aria2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ env:
GHCR_ORG_NAME: ${{ github.event.inputs.ghcr_org_name || vars.GHCR_ORG_NAME || github.repository_owner }}
GHCR_REGISTRY: ghcr.io
ARIA2_VERSION: ${{ github.event.inputs.aria2_version || '1.37.0' }}
ALPINE_VERSION: ${{ vars.ALPINE_VERSION || '3.24' }}

permissions:
packages: write
Expand Down Expand Up @@ -93,6 +94,8 @@ jobs:
pull: true
no-cache: true
build-args: |
ALPINE_VERSION=${{ env.ALPINE_VERSION }}
LOONG_ALPINE_VERSION=${{ env.ALPINE_VERSION }}
ARIA2_VERSION=${{ env.ARIA2_VERSION }}
tags: |
${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME }}
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/build-base-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ on:

env:
IMAGE_NAME: ${{ github.event.inputs.image_name || 'openlist-base-image' }}
DOCKERHUB_ORG_NAME: ${{ vars.DOCKERHUB_ORG_NAME || 'openlistteam' }}
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || 'openlistteam' }}
DOCKERHUB_ORG_NAME: ${{ vars.DOCKERHUB_ORG_NAME || github.repository_owner }}
GHCR_ORG_NAME: ${{ vars.GHCR_ORG_NAME || github.repository_owner }}
GHCR_REGISTRY: ghcr.io
RELEASE_PLATFORMS: 'linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/ppc64le,linux/riscv64'
LOONG64_PLATFORM: 'linux/loong64'
ALPINE_VERSION: ${{ vars.ALPINE_VERSION || '3.24' }}

permissions:
packages: write
Expand Down Expand Up @@ -69,7 +70,9 @@ jobs:
push: true
pull: true
no-cache: true
build-args: ${{ matrix.build_arg }}
build-args: |
${{ matrix.build_arg }}
ALPINE_VERSION=${{ env.ALPINE_VERSION }}
tags: |
${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME }}
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
Expand Down Expand Up @@ -138,7 +141,9 @@ jobs:
push: true
pull: true
no-cache: true
build-args: ${{ matrix.build_arg }}
build-args: |
${{ matrix.build_arg }}
LOONG_ALPINE_VERSION=${{ env.ALPINE_VERSION }}
tags: |
${{ env.DOCKERHUB_ORG_NAME }}/${{ env.IMAGE_NAME }}
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_ORG_NAME }}/${{ env.IMAGE_NAME }}
Expand Down
37 changes: 36 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,36 @@
# docker-library
# docker-library

## Fork 后的 GitHub Actions 配置

以下内容基于当前工作流整理:

- [.github/workflows/build-base-image.yaml](.github/workflows/build-base-image.yaml)
- [.github/workflows/build-aria2.yaml](.github/workflows/build-aria2.yaml)

### 必须配置(Secrets)

| 配置项 | 作用 | 来源 | 备注 |
| --- | --- | --- | --- |
| DOCKERHUB_TOKEN | 登录 DockerHub 并推送镜像 | 两个 workflow 都使用 secrets.DOCKERHUB_TOKEN | 建议使用 DockerHub Access Token |

### 建议配置(Repository Variables)

| 配置项 | 作用 | build-base-image 默认值 | build-aria2 默认值 |
| --- | --- | --- | --- |
| DOCKERHUB_ORG_NAME | DockerHub 命名空间 | vars.DOCKERHUB_ORG_NAME -> github.repository_owner | workflow_dispatch 输入值 -> vars.DOCKERHUB_ORG_NAME -> github.repository_owner |
| GHCR_ORG_NAME | GHCR 命名空间 | vars.GHCR_ORG_NAME -> github.repository_owner | workflow_dispatch 输入值 -> vars.GHCR_ORG_NAME -> github.repository_owner |
| ALPINE_VERSION | 统一 Alpine 基础镜像版本(传递到 base/aria2 构建参数) | 3.24 | 3.24 |

### 无需手动配置

| 配置项 | 说明 |
| --- | --- |
| GITHUB_TOKEN | GitHub Actions 自动提供,当前 workflow 已声明 permissions.packages: write |

### Fork 后最小可用清单

1. 在仓库 Settings -> Secrets and variables -> Actions -> Secrets 新增 DOCKERHUB_TOKEN。
2. 可选:在 Variables 新增 DOCKERHUB_ORG_NAME、GHCR_ORG_NAME、ALPINE_VERSION。
3. 在 `Actions` 页面手动触发:
- Build Base Docker Image
- Build Aria2 Docker Image (Matrix)
5 changes: 3 additions & 2 deletions aria2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM alpine:edge AS build
ARG ALPINE_VERSION=3.24
FROM alpine:${ALPINE_VERSION} AS build
ARG ARIA2_VERSION=1.37.0
LABEL org.opencontainers.image.authors="The OpenList Team" \
org.opencontainers.image.base.name="docker.io/openlistteam/openlist-aria2-standalone:${ARIA2_VERSION}" \
Expand All @@ -20,7 +21,7 @@ RUN cd /tmp/aria2-${ARIA2_VERSION} && \
make -j$(nproc) && \
make install

FROM alpine:edge
FROM alpine:${ALPINE_VERSION}
ARG ARIA2_VERSION=1.37.0
LABEL org.opencontainers.image.authors="The OpenList Team" \
org.opencontainers.image.base.name="docker.io/openlistteam/openlist-aria2-standalone:${ARIA2_VERSION}" \
Expand Down
5 changes: 3 additions & 2 deletions aria2/Dockerfile.loong64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/loong64/alpine:edge AS build
ARG LOONG_ALPINE_VERSION=3.24
FROM ghcr.io/loong64/alpine:${LOONG_ALPINE_VERSION} AS build
ARG ARIA2_VERSION=1.37.0
LABEL org.opencontainers.image.authors="The OpenList Team" \
org.opencontainers.image.base.name="docker.io/openlistteam/openlist-aria2-standalone:${ARIA2_VERSION}" \
Expand All @@ -20,7 +21,7 @@ RUN cd /tmp/aria2-${ARIA2_VERSION} && \
make -j$(nproc) && \
make install

FROM ghcr.io/loong64/alpine:edge
FROM ghcr.io/loong64/alpine:${LOONG_ALPINE_VERSION}
ARG ARIA2_VERSION=1.37.0
LABEL org.opencontainers.image.authors="The OpenList Team" \
org.opencontainers.image.base.name="docker.io/openlistteam/openlist-aria2-standalone:${ARIA2_VERSION}" \
Expand Down
3 changes: 2 additions & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM docker.io/library/alpine:edge
ARG ALPINE_VERSION=3.24
FROM docker.io/library/alpine:${ALPINE_VERSION}

ARG TARGETPLATFORM
ARG INSTALL_FFMPEG=false
Expand Down
3 changes: 2 additions & 1 deletion base/Dockerfile.loong64
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/loong64/alpine:edge
ARG LOONG_ALPINE_VERSION=3.24
FROM ghcr.io/loong64/alpine:${LOONG_ALPINE_VERSION}

ARG TARGETPLATFORM
ARG INSTALL_FFMPEG=false
Expand Down