Skip to content

Conversation

@davethiede
Copy link
Contributor

This PR:

  1. updates the rust version to 2023-07-11
  2. removes Cargo.lock from .dockerignore
  3. removes obsolete (as of 2023-07-11) feature flags
  4. removes a type ascription that is no longer supported by Rust
  5. updates Cargo.lock
  6. greatly simplifies the Dockerfile removing all redundancies and now depends on rust-toolchain.toml for component, target and channel information.

Features of this PR were inspired by the work of xonmello and earney and replaces #22

Cargo.lock is tracked so we need to allow
usage of the same crates in container builds.
There was a lot of redundancy between the
Dockerfile and the rust-toolchain.toml file. It
turns out that rust-toolchain.toml does almost all
the needed configuration needed for a container
build so the Dockerfile can be reduced to 4 lines.
@danielteberian
Copy link
Contributor

I just pushed a new version to the repository. I think I did a few of the things you did, but I am not sure. Can I merge the request?

@davethiede
Copy link
Contributor Author

you should be able to merge it. the feature flags patch should be redundant now. the rust-toolchain.toml file would create a conflict as I'm using the nightly-2023-07-11 version in my PR.

I don't know why patch e49ec3a showed up here. i was experimenting with bootimage on my forked repo.

@davethiede davethiede closed this by deleting the head repository Jul 15, 2023
@danielteberian
Copy link
Contributor

Why did you close it?

@davethiede
Copy link
Contributor Author

Why did you close it?

Some of the individual patches are still valid. the full patch set kept getting invalidated by your changes in the same files.

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.

2 participants