From 675ba8753d418f5ef6bb6e93d74ae5051436775b Mon Sep 17 00:00:00 2001 From: wu58430 <wu58430@126.com> Date: Wed, 10 Jan 2024 20:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compile-with-docker.bat | 4 ++-- compile-with-docker.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/compile-with-docker.bat b/compile-with-docker.bat index f66ee6e..f5b1e0a 100644 --- a/compile-with-docker.bat +++ b/compile-with-docker.bat @@ -1,5 +1,5 @@ @echo off -call clean.bat +del ".\compiled-firmware\" docker build -t uvk5 . -docker run -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp *.bin compiled-firmware/" +docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make both && cp *.bin compiled-firmware/" pause diff --git a/compile-with-docker.sh b/compile-with-docker.sh index 0a78b69..1a92433 100644 --- a/compile-with-docker.sh +++ b/compile-with-docker.sh @@ -1,3 +1,4 @@ -#!/bin/sh -docker build -t uvk5 . -docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/" \ No newline at end of file +#!/bin/sh +rm -rf compiled +docker build -t uvk5 . +docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make both && cp *.bin compiled-firmware/" \ No newline at end of file