fix a bug

This commit is contained in:
jiaojm
2026-01-05 17:10:12 +08:00
parent 44a0826a7d
commit b922e06827
3 changed files with 94 additions and 30 deletions

View File

@@ -17,14 +17,16 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y autoconf automake build-essential cmake curl file libtool
- name: Cross build multi-arch binary
run: |
mkdir dist
for arch in amd64 armv7 arm64 s390x; do
env BUILD_TARGET=$arch ./scripts/cross-build.sh
[ "$arch" = "armv7" ] && arch="arm"
mkdir -p dist/$arch && cp build/ttyd dist/$arch/ttyd
done
## 在dockerfile内编译的话应该不需要在这里交叉编译了
# - name: Cross build multi-arch binary
# run: |
# mkdir dist
# for arch in amd64 armv7 arm64 s390x; do
# env BUILD_TARGET=$arch ./scripts/cross-build.sh
# [ "$arch" = "armv7" ] && arch="arm"
# mkdir -p dist/$arch && cp build/ttyd dist/$arch/ttyd
# done
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- uses: docker/login-action@v3
@@ -49,22 +51,24 @@ jobs:
echo "DOCKER_TAG=tsl0922/ttyd:latest" >> $GITHUB_ENV
echo "ALPINE_TAG=tsl0922/ttyd:alpine" >> $GITHUB_ENV
esac
- name: build/push docker image
- name: Build and Push Ubuntu
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/s390x
file: ./Dockerfile # 指向刚才修改的 Ubuntu 版文件
platforms: linux/amd64,linux/arm64
push: true
tags: |
${{ env.DOCKER_TAG }}
ghcr.io/${{ env.DOCKER_TAG }}
- name: build/push docker image (alpine)
- name: Build and Push Alpine
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile.alpine
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/s390x
file: ./Dockerfile.alpine # 指向精简版文件
platforms: linux/amd64,linux/arm64
push: true
tags: |
${{ env.ALPINE_TAG }}