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

fix: Enable docker build without cli #9178

Conversation

ericzzzzzzz
Copy link
Contributor

@ericzzzzzzz ericzzzzzzz commented Nov 15, 2023

Fixes: #9103

Description:

  • when running dev, run, debug command, skaffold always uses cli to build for docker builder in build phase
  • This pr changes the part of a if condition that enable docker-cli by changing || matcher.isEmpty to || matcher.isCrossPlatform, So when user does not need to build cross-platform image, they don't have to have docker-cli installed, I think that what the comment was meant to as well.
  • I was trying to enable docker build without cli for cross-platfom builds as well, but tests are failing on kokoro, that will need some time to test and verify, I'll do it in a separate pr.
  • Also, remove the duplicate skaffold install, as we already built it when building skaffold-builder image
    RUN make clean out/skaffold VERSION=$VERSION && mv out/skaffold /usr/bin/skaffold && rm -rf secrets $SECRET

Copy link

codecov bot commented Nov 15, 2023

Codecov Report

Attention: 295 lines in your changes are missing coverage. Please review.

Comparison is base (290280e) 70.48% compared to head (151dd9b) 63.73%.
Report is 1067 commits behind head on main.

Files Patch % Lines
cmd/skaffold/app/cmd/exec.go 16.32% 40 Missing and 1 partial ⚠️
cmd/skaffold/app/cmd/filter.go 47.27% 22 Missing and 7 partials ⚠️
cmd/skaffold/app/cmd/lsp.go 28.12% 23 Missing ⚠️
cmd/skaffold/app/cmd/verify.go 23.33% 23 Missing ⚠️
cmd/skaffold/app/cmd/fix.go 51.16% 17 Missing and 4 partials ⚠️
cmd/skaffold/app/cmd/inspect_job_manifest_paths.go 60.00% 15 Missing and 1 partial ⚠️
cmd/skaffold/app/cmd/inspect_namespaces.go 50.00% 13 Missing and 1 partial ⚠️
...md/skaffold/app/cmd/inspect_config_dependencies.go 45.83% 12 Missing and 1 partial ⚠️
cmd/skaffold/app/cmd/lint.go 42.85% 12 Missing ⚠️
cmd/skaffold/app/cmd/inspect_build_env.go 60.71% 11 Missing ⚠️
... and 21 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9178      +/-   ##
==========================================
- Coverage   70.48%   63.73%   -6.75%     
==========================================
  Files         515      630     +115     
  Lines       23150    32447    +9297     
==========================================
+ Hits        16317    20680    +4363     
- Misses       5776    10178    +4402     
- Partials     1057     1589     +532     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pull-request-size pull-request-size bot added size/M and removed size/S labels Nov 16, 2023
@ericzzzzzzz ericzzzzzzz added the kokoro:force-run forces a kokoro re-run on a PR label Nov 16, 2023
@kokoro-team kokoro-team removed the kokoro:force-run forces a kokoro re-run on a PR label Nov 16, 2023
@ericzzzzzzz ericzzzzzzz force-pushed the enable-docker-build-without-cli branch from 154bd66 to 151dd9b Compare November 16, 2023 21:30
@ericzzzzzzz ericzzzzzzz marked this pull request as ready for review November 21, 2023 15:46
@ericzzzzzzz ericzzzzzzz merged commit 1fd9627 into GoogleContainerTools:main Nov 21, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] dev, run, debug use docker cli by default
3 participants