Reorganize Dockerfile and update scripts. - Githubissues

ctron / rust-esp-container

Container image with pre-built rust compiler for ESP32/ESP8266

Eclipse Public License 2.0

183 stars 20 forks source link

Reorganize Dockerfile and update scripts. #3

Closed 0ndorio closed 5 years ago

0ndorio commented 5 years ago

As the xtensa-esp32-rust toolchain contains multiple components which all require their own setup the Dockerfile is rather large. To increase the maintainability I tried to reorganize the file a bit.

The updated Dockerfile should ...

expose the expected versions of the toolchain components,
add a bit more structure to the final container,
avoid to build and run the llvm tests
remove unnecessary intermediate artefacts before they are persisted,
and replace xargo which is in maintanence mode with cargo-xbuild.

To reflect these changes the scripts got updated as well and all shellcheck related warnings got fixed. Also a new flash-project executable got added which can be used to flash the image to /dev/ttyUSB0.

Feel free to drop these changes / nitpick as much as you want. I will try to fix upcoming change requests asap.

0ndorio commented 5 years ago

Updated the pull request to include the latest state of rust-xtensa which merged the changes indirectly proposed through #1 .

0rvar commented 5 years ago

I could not get the current master container working, but the container from this PR worked well (had to give Docker a lot of resources to build it, though). I'd like this to get merged.

ctron commented 5 years ago

Sorry, I really must have overlooked this one. I really like the PR! Thank your for this work. I continued with some re-factoring on the develop branch, but I don't really like in which direction that was heading.

I will do a quick check between develop and master, and see if there is something missing for me. And then I will go ahead and merge this PR.

ctron commented 5 years ago

I reset the develop branch to master, and cherry picked your change. So the develop branch now contains this PR. And will do a build, and see what happens. As you know, this takes a while :grimacing: but I am on it!

ctron commented 5 years ago

Ok I just noticed that I never declared a license on this project. I added a proper LICENSE file and went with with EPLv2 … just because I always do :grinning: … please let me know if that works for you as well.

0ndorio commented 5 years ago

Ok I just noticed that I never declared a license on this project. I added a proper LICENSE file and went with with EPLv2 … just because I always do :grinning: … please let me know if that works for you as well.

EPLv2 is fine for me

ctron commented 5 years ago

Ok cool.

I cherry-picked the new commit into develop. And set up GitHub actions so that it can/should push to quay … let's wait a few hours and see what happens :grin:

ctron commented 5 years ago

The image successfully landed at quay.io/ctron/rust-esp:develop … Maybe you can test it as well.

0ndorio commented 5 years ago

The image successfully landed at quay.io/ctron/rust-esp:develop … Maybe you can test it as well.

Works like a charm!

ctron commented 5 years ago

Manually merged: 5d73b19e398448f549424735c1d833301ee6e6e9, e9d1f05904b2aa748122edab51d8244e71c8db2d

ctron commented 5 years ago

Thank you for the PR! And for your patience!