Merge pull request #21 from nbw74/main

Fix broken docker build

Dockerfile

@@ -1,10 +1,16 @@
+# hadolint ignore=DL3007
 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 set -eux; \
+  pacman -Syy --noconfirm \
+  arm-none-eabi-gcc \
+  arm-none-eabi-newlib \
+  base-devel \
+  git \
+  python-crcmod
 
 RUN git submodule update --init --recursive
-#RUN make && cp firmware* compiled-firmware/

Makefile

@@ -173,7 +173,6 @@ DEPS = $(OBJS:.o=.d)
 all: $(TARGET)
 	$(OBJCOPY) -O binary $< $<.bin
 	-python fw-pack.py $<.bin $(GIT_HASH) $<.packed.bin
-	-python3 fw-pack.py $<.bin $(GIT_HASH) $<.packed.bin
 	$(SIZE) $<
 
 debug:

compile-with-docker.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 docker build -t uvk5 .
-docker run -v $(PWD)/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"
+docker run -v "$(pwd)/compiled-firmware:/app/compiled-firmware" uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"