✨ gitea的runner参数化,可以通过docker-compose.yml进行配置
Ubuntu System Information / show-system-info (push) Successful in 39s
Ubuntu System Information / show-system-info (push) Successful in 39s
🐛 修复`Dockerfile`缺少系统包
This commit is contained in:
@@ -23,16 +23,20 @@ RUN pacman -Syu --noconfirm && \
|
||||
ninja \
|
||||
curl \
|
||||
git \
|
||||
nodejs \
|
||||
npm \
|
||||
python \
|
||||
python-pyyaml \
|
||||
python-pip \
|
||||
paru \
|
||||
conan \
|
||||
sudo \
|
||||
vim \
|
||||
supervisor \
|
||||
qemu-user-static \
|
||||
qemu-user-static-binfmt \
|
||||
fakeroot \
|
||||
docker \
|
||||
docker-buildx \
|
||||
&& pacman -Scc --noconfirm
|
||||
|
||||
# AUR 用户(paru 需非 root 运行)
|
||||
@@ -43,7 +47,7 @@ RUN useradd -m aur && \
|
||||
# 安装额外的 AUR 工具
|
||||
USER aur
|
||||
WORKDIR /home/aur
|
||||
RUN paru -S --noconfirm --needed --noprogressbar llvm-mingw-w64-toolchain-ucrt-bin && \
|
||||
RUN paru -S --noconfirm --needed --noprogressbar conan-bin llvm-mingw-w64-toolchain-ucrt-bin && \
|
||||
paru -Scc --noconfirm && \
|
||||
rm -rf ~/.cache/paru
|
||||
|
||||
@@ -51,6 +55,10 @@ RUN paru -S --noconfirm --needed --noprogressbar llvm-mingw-w64-toolchain-ucrt-b
|
||||
USER root
|
||||
WORKDIR /root
|
||||
|
||||
# 交叉工具链可用:确保 windres 在 PATH,避免 CMake 查找失败
|
||||
ENV PATH="/opt/llvm-mingw/llvm-mingw-ucrt/bin:${PATH}"
|
||||
ENV RC="/opt/llvm-mingw/llvm-mingw-ucrt/bin/x86_64-w64-mingw32-windres"
|
||||
|
||||
# 验证 qemu 和 docker 安装
|
||||
RUN qemu-aarch64-static --version && \
|
||||
qemu-x86_64-static --version && \
|
||||
|
||||
@@ -20,6 +20,9 @@ services:
|
||||
# Arch Linux Buildx 配置 - 使用 tonistiigi/binfmt
|
||||
- ENABLE_BUILDX=true
|
||||
- BINFMT_METHOD=tonistiigi
|
||||
- GITEA_INSTANCE=https://git.mytsl.cn
|
||||
- GITEA_TOKEN=
|
||||
- DEFAULT_RUNNER_NAME=buildx-archlinux
|
||||
- DEFAULT_RUNNER_LABEL=archlinux:host://archlinux:latest,company-server:host://archlinux:latest,buildx-archlinux:host://archlinux:latest
|
||||
|
||||
# 如果需要使用代理,取消下面的注释并修改为你的代理地址
|
||||
|
||||
Reference in New Issue
Block a user