From 7f013d6d0b6646dfd2d6e3ebb18caf95047c5b72 Mon Sep 17 00:00:00 2001 From: pbrier Date: Thu, 16 Sep 2021 10:27:48 +0200 Subject: [PATCH] Fixed dockerbuild.sh, now run as user (instead of root) and fixed the autogeneration of version.c --- Dockerfile | 2 ++ dockerbuild.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06bdadf1..1f9a5840 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ WORKDIR ODrive/Firmware # Must attach the firmware tree into the container CMD \ # Regenerate python interface + mkdir ../Firmware/autogen; \ python interface_generator_stub.py \ --definitions odrive-interface.yaml \ --template ../tools/enums_template.j2 \ @@ -26,6 +27,7 @@ CMD \ --definitions odrive-interface.yaml \ --template ../tools/arduino_enums_template.j2 \ --output ../Arduino/ODriveArduino/ODriveEnums.h && \ + python ../tools/odrive/version.py --output ../Firmware/autogen/version.c && \ # Hack around Tup's dependency on FUSE tup init && \ tup generate build.sh && \ diff --git a/dockerbuild.sh b/dockerbuild.sh index acf77e9d..62959930 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -17,7 +17,7 @@ function build { docker build -t odrive-build-img . echo "Build in container" - docker run -v $(pwd):/ODrive --name odrive-build-cont odrive-build-img:latest + docker run -it -v $(pwd):/ODrive --name odrive-build-cont --user $(id -u) odrive-build-img:latest } function usage {