Skip to content

Commit

Permalink
fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
sheurich committed Feb 28, 2024
1 parent 4b54e2c commit 20f1d2f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ jobs:
uses: actions/download-artifact@v4
with:
merge-multiple: true
path: ./dist
pattern: ${{ matrix.app }}-${{ matrix.docker-os }}-${{ matrix.docker-arch }}
- name: Display artifacts
run: ls -lR .
run: ls -lR ./dist
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand All @@ -88,7 +89,7 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: APP=${{ matrix.app }}
build-contexts: dist-files=.
build-contexts: dist-files=./dist
cache-from: type=gha
cache-to: type=gha,mode=max
file: Dockerfile.release
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ FROM --platform=${TARGETPLATFORM} mcr.microsoft.com/windows/nanoserver:ltsc2022
# Use build arguments to select the appropriate binary for Linux
FROM linux-base AS linux
ARG APP
COPY --from=dist-files ./${APP} /app
COPY --from=dist-files /${APP} /app
CMD /app

# Use build arguments to select the appropriate binary for Windows
FROM windows-base AS windows
ARG APP
COPY --from=dist-files ./${APP}.exe /app.exe
COPY --from=dist-files /${APP}.exe /app.exe
CMD /app.exe

# Final stage: dynamically select between Linux and Windows stages based on TARGETOS argument
Expand Down

0 comments on commit 20f1d2f

Please sign in to comment.