diff --git a/Dockerfile b/Dockerfile index 3a96886..fd2ca7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=amd64 archlinux:latest +FROM --platform=linux/amd64 RUN pacman -Syyu base-devel --noconfirm RUN pacman -Syyu arm-none-eabi-gcc --noconfirm RUN pacman -Syyu arm-none-eabi-newlib --noconfirm @@ -7,6 +7,4 @@ RUN pacman -Syyu python-pip --noconfirm RUN pacman -Syyu python-crcmod --noconfirm WORKDIR /app COPY . . - -RUN git submodule update --init --recursive -#RUN make && cp firmware* compiled-firmware/ +RUN git submodule update --init --recursive \ No newline at end of file diff --git a/compile-with-docker-all.sh b/compile-with-docker-all.sh new file mode 100755 index 0000000..9cad587 --- /dev/null +++ b/compile-with-docker-all.sh @@ -0,0 +1,25 @@ +#!/bin/sh +#export DOCKER_DEFAULT_PLATFORM=linux/amd64 +IMAGE_NAME="uvk5" +rm "${PWD}/compiled-firmware/*" +docker build -t $IMAGE_NAME . +docker run --rm -v "${PWD}/compiled-firmware/:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make -s \ +ENABLE_SPECTRUM=1 \ +ENABLE_FMRADIO=0 \ +TARGET=f4hwn.bandscope \ +&& cp f4hwn.bandscope* compiled-firmware/" +docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \ +ENABLE_SPECTRUM=0 \ +ENABLE_FMRADIO=1 \ +TARGET=f4hwn.broadcast \ +&& cp f4hwn.broadcast* compiled-firmware/" +docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \ +ENABLE_SPECTRUM=1 \ +ENABLE_FMRADIO=1 \ +ENABLE_VOX=0 \ +ENABLE_AIRCOPY=0 \ +ENABLE_AUDIO_BAR=0 \ +ENABLE_FEAT_F4HWN_SPECTRUM=0 \ +ENABLE_FEAT_F4HWN_SLEEP=0 \ +TARGET=f4hwn.voxless \ +&& cp f4hwn.voxless* compiled-firmware/" \ No newline at end of file diff --git a/compile-with-docker.sh b/compile-with-docker.sh index f78f5ff..7ad8490 100755 --- a/compile-with-docker.sh +++ b/compile-with-docker.sh @@ -1,6 +1,5 @@ #!/bin/sh - +#export DOCKER_DEFAULT_PLATFORM=linux/amd64 IMAGE_NAME="uvk5" - docker build -t $IMAGE_NAME . -docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make && cp f4hwn* compiled-firmware/" \ No newline at end of file +docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make && cp f4hwn* compiled-firmware/" \ No newline at end of file