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

Change builder image #35

Open
wants to merge 4 commits into
base: osc-release
Choose a base branch
from

Conversation

littlejawa
Copy link

Use golang 1.23 from openshift builder images.

Bringing the konflux build to the same level as our downstream CPaaS builds.
Changing the builder image first, as it seems to cause build issues.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
@littlejawa littlejawa removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2025
@littlejawa littlejawa force-pushed the change_go_builder_image branch from b689dcf to dcdfc30 Compare March 26, 2025 14:33
This was added by mistake - needed for local build, but not in the repo.
It doesn't break the build as Konflux actually sets this same folder by itself,
but it should not be left by default.

Signed-off-by: Julien Ropé <[email protected]>
@littlejawa littlejawa force-pushed the change_go_builder_image branch 2 times, most recently from f61f21e to 86eb2cf Compare March 26, 2025 16:55
…pstream

Rather than hardcoding the values we need in the Dockerfile, use
build environment variables to pass the parameters during build.

This reduces the differences with upstream's Dockerfile, and should ease
its maintenance.

Signed-off-by: Julien Ropé <[email protected]>
Use golang 1.23 from openshift builder images.

Signed-off-by: Julien Ropé <[email protected]>
Our builder image uses a wrapper script on top of the go binary.
This wrapper is not keeping the quotes as they are set in the Makefile,
making the resulting parameters to the 'go' command miss a closing quote.

This commit fixes it by removing quotes in the GOFLAGS variable in the Makefile.

Signed-off-by: Julien Ropé <[email protected]>
@littlejawa littlejawa force-pushed the change_go_builder_image branch from 86eb2cf to 42d300e Compare April 2, 2025 12:36
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.

1 participant