1237366 - Import rust toolchain container description

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Ralph Giles (:rillian)]

Per Ted on irc, we should move the rust toolchain builder into the three.

I've been experimenting with doing the custom builds we're using for linux64 tooltool at https://github.com/rillian/rust-build/ based on the rust project's buildbot worker image at https://github.com/rust-lang/rust-buildbot/

Comment 1

[Ralph Giles (:rillian)]

Attachment: Import rust-build

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 8704763 [details] [diff] [review]
Import rust-build

Review of attachment 8704763 [details] [diff] [review]:
-----------------------------------------------------------------

This looks fine, but Dustin may have some thoughts.

Comment 3

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8704763 [details] [diff] [review]
Import rust-build

Review of attachment 8704763 [details] [diff] [review]:
-----------------------------------------------------------------

This looks fine as far as it goes (TIL `grep -c` -- cool!).  However, there's some extra machinery in-tree that will probably be useful for you.  And using it will help the next person to not be surprised by this directory.  Not quite r-, but I think these changes will be beneficial for you.

In particular, testing/docker/build.sh can run the Dockerfile in a subdirectory for you, and automatically tag things.  So you could remove your Makefile and add VERSION and REGISTRY files (the former with the image version; the latter with the repository you will push the image to, so maybe "rust" for a docker hub org of that name, or "quay.io/rust" if you're a quay.io user.

This arrangement fits with the other images in testing/docker, and allows you to version the image nicely in hg.  It is also supported by the decision task's docker-image-building support, if and when this becomes a part of the gecko build graph.

The one tricky bit I see is that testing/docker/build.sh looks for testing/docker/rust-build/build.sh and assumes it is a script to build the docker image, rather than a script to build the toolchain.  So you may need to rename that script, perhaps to bin/build.sh or just build-toolchain.sh.

Finally, you might consisder putting the build script in the rust repository, and running `checkout-sources.sh && ${WORKSPACE}/rust/util/build-toolchain.sh`.  Then if you need to tweak something in the toolchain build process, you don't need to rebuild the docker image.

Comment 4

[Ralph Giles (:rillian)]

Attachment: address review comments

Follow-up patch removes the Makefile, renames fetch and build scripts to avoid conflicts, adds VERSION and REGISTRY files.

> Finally, you might consisder putting the build script in the rust repository.

I'd like to keep it on our side for now. I want to move to using upstream's builds when possible, but that isn't an option yet. Until then, this is all gecko-specific and I doubt the rust maintainers would be interested.

Comment 5

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8710716 [details] [diff] [review]
address review comments

Review of attachment 8710716 [details] [diff] [review]:
-----------------------------------------------------------------

apologies for the delay in reviewing

Comment 6

[Ralph Giles (:rillian)]

No worries. Thanks for reviewing!

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/82c6529ab55a
https://hg.mozilla.org/integration/mozilla-inbound/rev/21b9c3fb9e53

Comment 8

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/82c6529ab55a
https://hg.mozilla.org/mozilla-central/rev/21b9c3fb9e53