Skip to content

don't use null values in the bake definition#4122

Merged
thaJeztah merged 1 commit intodocker:masterfrom
crazy-max:fix-bake
Mar 27, 2023
Merged

don't use null values in the bake definition#4122
thaJeztah merged 1 commit intodocker:masterfrom
crazy-max:fix-bake

Conversation

@crazy-max
Copy link
Copy Markdown
Member

@crazy-max crazy-max commented Mar 27, 2023

- What I did

Remove null values in the bake definition to avoid issues with environments with old Buildx version (< 0.10).

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@crazy-max
Copy link
Copy Markdown
Member Author

e2e tests are not in good shape: https://github.com/docker/cli/actions/runs/4531228785/jobs/7981128986?pr=4122#step:5:850

=== FAIL: e2e/trust TestSignLocalImage (0.15s)
    sign_test.go:32: assertion failed: 
        Command:  docker trust sign registry:5000/sign:v1
        ExitCode: 1
        Error:    exit status 1
        Stdout:   
        Stderr:   Error: error contacting notary server: x509: certificate has expired or is not yet valid: current time 2023-03-27T10:13:42Z is after 2023-03-25T14:47:57Z

@thaJeztah
Copy link
Copy Markdown
Member

OH! Yes, that was the other one I found in #4121 (comment). I started to look at that, when the whole Windows Defender whack-a-mole began 😂

@thaJeztah
Copy link
Copy Markdown
Member

can you try rebasing?

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
@crazy-max
Copy link
Copy Markdown
Member Author

can you try rebasing?

Can't atm: https://www.githubstatus.com/incidents/52z0j6phhnjs

@thaJeztah
Copy link
Copy Markdown
Member

AH! That explained why I couldn't push. I tried, but it failed, then saw you were out of your meeting

1 similar comment
@thaJeztah
Copy link
Copy Markdown
Member

AH! That explained why I couldn't push. I tried, but it failed, then saw you were out of your meeting

@crazy-max
Copy link
Copy Markdown
Member Author

@thaJeztah Should be good now

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 27, 2023

Codecov Report

Merging #4122 (bec5d37) into master (7f11449) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4122   +/-   ##
=======================================
  Coverage   59.16%   59.16%           
=======================================
  Files         287      287           
  Lines       24716    24716           
=======================================
  Hits        14623    14623           
  Misses       9209     9209           
  Partials      884      884           

@thaJeztah
Copy link
Copy Markdown
Member

CI is happy 🎉

@thaJeztah thaJeztah merged commit 2165386 into docker:master Mar 27, 2023
@crazy-max crazy-max deleted the fix-bake branch March 27, 2023 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants