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.

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

Update Go version in Docker, and re-enable SCC/Scorecard #2957

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

GregSutcliffe
Copy link
Contributor

Description
This commit fixes a couple of things.

Firstly, the install-go script uses an ancient version of Go that conflicts with the newer version needed for SCC, so that is updated. That script also wrapped the install in a function for no apparent reason, so I simplified it.

Second, I re-enabled the SCC & Scorecard installs. These have been commented out for some time, apparently because of the Go issues. Rather than uncomment it, I copied the relevant parts from workers.sh because the container doesn't need checks about whether directories exist - these are guaranteed not to exist in a fresh container.

Notes for Reviewers

I believe this will result in working SCC and Scorecard calculations in the container now

Signed commits

  • [x ] Yes, I signed my commits.

Copy link
Member

@sgoggins sgoggins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! LGTM!

@sgoggins sgoggins self-assigned this Dec 5, 2024
@sgoggins sgoggins added the docker Related to our Docker images label Dec 5, 2024
@sgoggins sgoggins linked an issue Dec 5, 2024 that may be closed by this pull request
@sgoggins sgoggins merged commit a31a04c into chaoss:main Dec 5, 2024
6 checks passed
@GregSutcliffe
Copy link
Contributor Author

Thanks @sgoggins - for the record I don't think this affects #2952, as I've not touched the rust build part at all. I suspect that was a transient failure to download rust - I have a plan to move the image to use build layers (see #2947 for some of that) which will help there, but ENOTIME :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docker Related to our Docker images
Projects
Status: Main
Development

Successfully merging this pull request may close these issues.

Docker-compose: rustup: not found
2 participants