Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed dockerbuild.sh #627

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Fixed dockerbuild.sh #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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