-
Notifications
You must be signed in to change notification settings - Fork 44
[DX-3066] Don't skip private plugins when building the image #2458
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bd636e8
do not use hardcoded CL_INSTALL_PRIVATE_PLUGINS when building images
Tofel 8dfb064
pass GITHUB_TOKEN as secret to docker build, if it is present
Tofel 9bdb824
Merge branch 'main' into dx-3066-plugins-image
Tofel b5d36d5
Build docker images with buildx
Tofel f4f53d6
update changeset
Tofel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| - Don't set `CL_INSTALL_PRIVATE_PLUGINS` env var to `false` when building Docker images | ||
| - Build docker images with buildx |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -418,18 +418,25 @@ func BuildImageOnce(once *sync.Once, dctx, dfile, nameAndTag string, buildArgs m | |
|
|
||
| func BuildImage(dctx, dfile, nameAndTag string, buildArgs map[string]string) error { | ||
| dfilePath := filepath.Join(dctx, dfile) | ||
|
|
||
| if os.Getenv("CTF_CLNODE_DLV") == "true" { | ||
| commandParts := []string{"docker", "build", "--build-arg", `GO_GCFLAGS=all=-N -l`, "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false"} | ||
| commandParts := []string{"docker", "buildx", "build", "--build-arg", `GO_GCFLAGS=all=-N -l`, "--build-arg", "CHAINLINK_USER=chainlink"} | ||
| for k, v := range buildArgs { | ||
| commandParts = append(commandParts, "--build-arg", fmt.Sprintf("%s=%s", k, v)) | ||
| } | ||
| if os.Getenv("GITHUB_TOKEN") != "" { | ||
| commandParts = append(commandParts, "--secret", "id=GIT_AUTH_TOKEN,env=GITHUB_TOKEN") | ||
| } | ||
| commandParts = append(commandParts, "-t", nameAndTag, "-f", dfilePath, dctx) | ||
| return RunCommand(commandParts[0], commandParts[1:]...) | ||
| } | ||
| commandParts := []string{"docker", "build", "--build-arg", "CHAINLINK_USER=chainlink", "--build-arg", "CL_INSTALL_PRIVATE_PLUGINS=false"} | ||
| commandParts := []string{"docker", "buildx", "build", "--build-arg", "CHAINLINK_USER=chainlink"} | ||
| for k, v := range buildArgs { | ||
| commandParts = append(commandParts, "--build-arg", fmt.Sprintf("%s=%s", k, v)) | ||
| } | ||
| if os.Getenv("GITHUB_TOKEN") != "" { | ||
| commandParts = append(commandParts, "--secret", "id=GIT_AUTH_TOKEN,env=GITHUB_TOKEN") | ||
| } | ||
|
Comment on lines
+437
to
+439
|
||
| commandParts = append(commandParts, "-t", nameAndTag, "-f", dfilePath, dctx) | ||
| return RunCommand(commandParts[0], commandParts[1:]...) | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
docker build --secret ...requires BuildKit; on environments where BuildKit isn't the default, this will fail with "unknown flag: --secret" wheneverGITHUB_TOKENis set (e.g., GitHub Actions). Consider explicitly enabling BuildKit for this invocation (e.g., settingDOCKER_BUILDKIT=1on the exec.Cmd env) or using a BuildKit-aware builder (docker buildx build), and/or gating--secretbehind a BuildKit check.