Skip to content

Commit 28e393b

Browse files
committed
Remove changes to Dockerfile
1 parent b9c63c9 commit 28e393b

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,19 @@ jobs:
4545
echo "version=${GIT_VERSION:1}" >> $GITHUB_OUTPUT
4646
echo "archive=w64devkit-$ARCH-${GIT_VERSION:1}" >> $GITHUB_OUTPUT
4747
48-
- name: Build and extract artifact
48+
- name: Build image
4949
uses: docker/build-push-action@v6
5050
with:
5151
context: .
52-
target: dist
53-
outputs: type=local,dest=.
52+
tags: w64devkit:${{ matrix.arch }}
53+
load: true
5454
cache-from: type=gha,scope=w64devkit-${{ matrix.arch }}
5555
cache-to: type=gha,scope=w64devkit-${{ matrix.arch }},mode=max
5656

57+
- name: Extract artifact
58+
run: |
59+
docker run --rm w64devkit:${{ matrix.arch }} > w64devkit.exe
60+
5761
- name: Rename artifact
5862
run: |
5963
mv w64devkit.exe ${{ steps.filename.outputs.archive }}.exe

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim AS builder
1+
FROM debian:bookworm-slim
22

33
ARG VERSION=2.4.0
44
ARG PREFIX=/w64devkit
@@ -524,10 +524,5 @@ RUN printf "id ICON \"$PREFIX/src/w64devkit.ico\"" >w64devkit.rc \
524524
>>$PREFIX/COPYING.MinGW-w64-runtime.txt \
525525
&& echo $VERSION >$PREFIX/VERSION.txt \
526526
&& 7z a -mx=9 -mtm=- $PREFIX.7z $PREFIX \
527-
&& cat /7z/7z.sfx $PREFIX.7z > /w64devkit.exe
528527
ENV PREFIX=${PREFIX}
529528
CMD cat /7z/7z.sfx $PREFIX.7z
530-
531-
# Minimal stage for CI artifact extraction (optional, doesn't affect default build)
532-
FROM scratch AS dist
533-
COPY --from=builder /w64devkit.exe /w64devkit.exe

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ building the kit itself.
2222

2323
Build the image, then run it to produce a self-extracting 7z archive:
2424

25-
docker build --target builder -t w64devkit .
25+
docker build -t w64devkit .
2626
docker run --rm w64devkit >w64devkit-x64.exe
2727

2828
This takes about 15 minutes on modern systems. You will need an internet

0 commit comments

Comments
 (0)