ljw 1 год назад
Родитель
Сommit
5ad31679a8
2 измененных файлов с 5 добавлено и 2 удалено
  1. 3 1
      .github/workflows/build.yml
  2. 2 1
      Dockerfile

+ 3 - 1
.github/workflows/build.yml

@@ -140,7 +140,7 @@ jobs:
140
 
140
 
141
       - name: Unzip binaries
141
       - name: Unzip binaries
142
         run: |
142
         run: |
143
-          tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz
143
+          tar -xzf ${{ matrix.job.goos }}-${{ matrix.job.platform }}.tar.gz -C ${{ matrix.job.platform }}
144
 
144
 
145
       - name: Build and push Docker image
145
       - name: Build and push Docker image
146
         uses: docker/build-push-action@v5
146
         uses: docker/build-push-action@v5
@@ -150,6 +150,8 @@ jobs:
150
           platforms: linux/amd64,linux/arm64
150
           platforms: linux/amd64,linux/arm64
151
           push: true
151
           push: true
152
           provenance: false
152
           provenance: false
153
+          build-args: |
154
+            BUILDARCH=${{ matrix.job.platform }}
153
           tags: |
155
           tags: |
154
             lejianwen/rustdesk-api:${{ env.LATEST_TAG }}
156
             lejianwen/rustdesk-api:${{ env.LATEST_TAG }}
155
             lejianwen/rustdesk-api:${{ env.TAG }}
157
             lejianwen/rustdesk-api:${{ env.TAG }}

+ 2 - 1
Dockerfile

@@ -1,8 +1,9 @@
1
 FROM alpine
1
 FROM alpine
2
 
2
 
3
+ARG BUILDARCH
3
 WORKDIR /app
4
 WORKDIR /app
4
 RUN apk add --no-cache tzdata
5
 RUN apk add --no-cache tzdata
5
-COPY ./release /app/
6
+COPY ./${BUILDARCH}/release /app/
6
 VOLUME /app/data
7
 VOLUME /app/data
7
 
8
 
8
 EXPOSE 21114
9
 EXPOSE 21114