From 5ad31679a83b26710fd2467a892ef3915bf50598 Mon Sep 17 00:00:00 2001 From: ljw <84855512@qq.com> Date: Sat, 28 Sep 2024 09:33:59 +0800 Subject: [PATCH] fix build docker image --- .github/workflows/build.yml | 4 +++- Dockerfile | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d160c19..66c5c51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,7 +140,7 @@ jobs: - name: Unzip binaries run: | - tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz + tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz -C ${{ matrix.job.platform }} - name: Build and push Docker image uses: docker/build-push-action@v5 @@ -150,6 +150,8 @@ jobs: platforms: linux/amd64,linux/arm64 push: true provenance: false + build-args: | + BUILDARCH=${{ matrix.job.platform }} tags: | lejianwen/rustdesk-api:${{ env.LATEST_TAG }} lejianwen/rustdesk-api:${{ env.TAG }} diff --git a/Dockerfile b/Dockerfile index c9778aa..c2482da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM alpine +ARG BUILDARCH WORKDIR /app RUN apk add --no-cache tzdata -COPY ./release /app/ +COPY ./${BUILDARCH}/release /app/ VOLUME /app/data EXPOSE 21114