Skip to content

Commit

Permalink
Merge pull request #627 from pbrier/docker_build_fix
Browse files Browse the repository at this point in the history
Fixed dockerbuild.sh
  • Loading branch information
samuelsadok authored Oct 22, 2021
2 parents 13f95de + 7f013d6 commit 341d727
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion dockerbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 341d727

Please sign in to comment.