Skip to content

Reorganize Dockerfile and update scripts. #3

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.

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

Closed
wants to merge 2 commits into from

Conversation

0ndorio
Copy link
Contributor

@0ndorio 0ndorio commented Jul 25, 2019

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.

As the xtensa-esp32-rust toolchain contains multiple components which
all require their own setup the Dockerfile is rather large. To increase
the maintainability the file got reorganized.

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`.
@0ndorio 0ndorio force-pushed the task/cleanup_scripts branch from 74478b2 to f9bcae2 Compare July 25, 2019 16:16
@0ndorio
Copy link
Contributor Author

0ndorio commented Jul 25, 2019

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

@0rvar
Copy link
Contributor

0rvar commented Aug 17, 2019

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
Copy link
Owner

ctron commented Sep 17, 2019

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
Copy link
Owner

ctron commented Sep 17, 2019

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 😬 but I am on it!

@ctron
Copy link
Owner

ctron commented Sep 17, 2019

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 😀 … please let me know if that works for you as well.

Adds missing `flash-project` into containers `/usr/local/bin/`.
@0ndorio
Copy link
Contributor Author

0ndorio commented Sep 17, 2019

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 😀 … please let me know if that works for you as well.

EPLv2 is fine for me

@ctron
Copy link
Owner

ctron commented Sep 18, 2019

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 😁

@ctron
Copy link
Owner

ctron commented Sep 18, 2019

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

@0ndorio
Copy link
Contributor Author

0ndorio commented Sep 19, 2019

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

Works like a charm!

@ctron
Copy link
Owner

ctron commented Sep 19, 2019

Manually merged: 5d73b19, e9d1f05

@ctron ctron closed this Sep 19, 2019
@ctron
Copy link
Owner

ctron commented Sep 19, 2019

Thank you for the PR! And for your patience!

@0ndorio 0ndorio deleted the task/cleanup_scripts branch September 19, 2019 10:52
@0ndorio 0ndorio restored the task/cleanup_scripts branch September 19, 2019 10:56
@0ndorio 0ndorio deleted the task/cleanup_scripts branch September 19, 2019 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants