From c070282b25ed980b2c22d7d2ca0b55f3fc18f219 Mon Sep 17 00:00:00 2001
From: egzumer <egzumer@gmail.com>
Date: Thu, 28 Sep 2023 15:51:14 +0200
Subject: [PATCH] Dockerfile modified to build much faster, compile-with-docker
 script for windows (#54)

---
 .gitignore              | 3 +--
 Dockerfile              | 6 ++++--
 compile-with-docker.bat | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 compile-with-docker.bat

diff --git a/.gitignore b/.gitignore
index 4317070..22f6c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *.o
 *.d
-firmware
-firmware.bin
+/compiled-firmware
 link-overlay.S
 sram-overlay
 sram-overlay.bin
diff --git a/Dockerfile b/Dockerfile
index fc633d6..4b6c3f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
 FROM archlinux:latest
-WORKDIR /app
-COPY . .
 RUN pacman -Syyu base-devel --noconfirm
 RUN pacman -Syyu arm-none-eabi-gcc --noconfirm
 RUN pacman -Syyu arm-none-eabi-newlib --noconfirm
 RUN pacman -Syyu git --noconfirm
+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/
diff --git a/compile-with-docker.bat b/compile-with-docker.bat
new file mode 100644
index 0000000..f1eae9b
--- /dev/null
+++ b/compile-with-docker.bat
@@ -0,0 +1,3 @@
+@echo off
+docker build -t uvk5 .
+docker run -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"
\ No newline at end of file