From 748f7e4fc36d5ae738e9665478ffbdeb294bae7d Mon Sep 17 00:00:00 2001
From: coreglitch <mail@s3f.ru>
Date: Tue, 10 Nov 2020 22:42:18 +0600
Subject: [PATCH] add dfu util to container, enable usb in container (#229)

* add dfu util to container, enable usb in container
* add DFU_SERIAL env
---
 docker-compose.yml | 2 +-
 docker/Dockerfile  | 7 +++++++
 make/rules.mk      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ac6d569..42d05584 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     stdin_open: true
     volumes:
       - .:/project
-#      - /dev/bus/usb:/dev/bus/usb
+      - /dev/bus/usb:/dev/bus/usb
     working_dir: "/project"
     environment:
       DISPLAY: $DISPLAY
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b2ca430..2998e2fb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,6 +59,13 @@ RUN apt update && \
     wget http://mirrors.kernel.org/ubuntu/pool/universe/g/gdb-arm-none-eabi/gdb-arm-none-eabi_7.10-1ubuntu3+9_amd64.deb && \
     dpkg -i gdb-arm-none-eabi_7.10-1ubuntu3+9_amd64.deb
 
+# dfu-util
+
+RUN apt update && \
+    apt install -y --no-install-recommends \
+        dfu-util \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 COPY entrypoint.sh syntax_check.sh /
 
 RUN chmod +x /syntax_check.sh
diff --git a/make/rules.mk b/make/rules.mk
index c5b229d6..12905160 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -59,7 +59,7 @@ $(OBJ_DIR)/flash: $(OBJ_DIR)/$(PROJECT).bin
 	touch $@
 
 $(OBJ_DIR)/upload: $(OBJ_DIR)/$(PROJECT).bin
-	dfu-util -D $(OBJ_DIR)/$(PROJECT).bin -a 0 -s $(FLASH_ADDRESS):leave
+	dfu-util -D $(OBJ_DIR)/$(PROJECT).bin -a 0 -s $(FLASH_ADDRESS) -S $(DFU_SERIAL)
 	touch $@
 
 $(ASSETS): $(ASSETS_SOURCES)