Skip to content

Commit

Permalink
Merge pull request #21 from nbw74/main
Browse files Browse the repository at this point in the history
Fix broken docker build
  • Loading branch information
fagci authored Sep 30, 2023
2 parents f928b69 + be4f6ac commit dc3aeab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
16 changes: 11 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion compile-with-docker.sh
Original file line number Diff line number Diff line change
@@ -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/"

0 comments on commit dc3aeab

Please sign in to comment.