From e6767ecbadb32d8f30f820d829d3c6cf71ff25cd Mon Sep 17 00:00:00 2001 From: "Joseph C. Lehner" Date: Mon, 30 Sep 2024 16:47:42 +0200 Subject: [PATCH] Ignore cache for Docker builds --- Dockerfile | 4 +++- Makefile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 164b80b..e1e0cbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,9 @@ WORKDIR /usr/src/nmrpflash RUN wget -O npcap-sdk.zip https://npcap.com/dist/npcap-sdk-${NPCAP_VERSION}.zip RUN unzip npcap-sdk.zip -d Npcap -RUN make release/linux-appimage +ARG CACHEBUST=1 + RUN make clean +RUN make release/linux-appimage RUN make MINGW=i686-w64-mingw32- release release/win32 diff --git a/Makefile b/Makefile index e47c200..c5c60db 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ nmrpflash.ico: nmrpflash.svg convert -background transparent -define icon:auto-resize=256,64,48,32,16 $< $@ build-release-with-docker: - docker build -t nmrpflash . + docker build --build-arg CACHEBUST=$(shell date +%s) --progress=plain -t nmrpflash . docker create --name dummy nmrpflash docker cp dummy:/usr/src/nmrpflash/nmrpflash-$(VERSION)-linux-$(ARCH).zip . docker cp dummy:/usr/src/nmrpflash/nmrpflash-$(VERSION)-win32.zip .