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

Updating to Docker 26.x & lifecycle 0.19.4 #2136

Merged
merged 9 commits into from May 8, 2024

Conversation

jjbustamante
Copy link
Member

@jjbustamante jjbustamante commented Apr 18, 2024

Summary

With docker 26.0.0 some refactoring was done and the parsing logic for volumes is not available on darwin, as a consequence pack failed to compile on mac machines. See this discussion created for more details.

This PR in addition to update the dependencies to docker 26.0.0 also reimplement the processVolumes method for darwin os.

Output

Before

when compiling pack after updating the dependencies to docker 26.0.0

=====> Linting code...
WARN [linters_context] rowserrcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649. 
pkg/client/build.go:26:2: could not import github.com/docker/docker/volume/mounts (-: # github.com/docker/docker/volume/mounts
../../../../pkg/mod/github.com/docker/docker@v26.0.1+incompatible/volume/mounts/mounts.go:187:30: undefined: safepath.Join) (typecheck)
        "github.com/docker/docker/volume/mounts"
        ^
make: *** [lint] Error 1

After

The code compiles and the unit tests are passing

Documentation

  • Should this change be documented?
    • Yes, see #___
    • No

Related

Resolves #___

@github-actions github-actions bot added type/enhancement Issue that requests a new feature or improvement. type/chore Issue that requests non-user facing changes. labels Apr 18, 2024
@github-actions github-actions bot added this to the 0.34.0 milestone Apr 18, 2024
Signed-off-by: Juan Bustamante <bustamantejj@gmail.com>
@jjbustamante jjbustamante force-pushed the deps/jjbustamante/update-to-docker-26 branch from 06ef755 to 58fd4be Compare April 22, 2024 16:44
@jjbustamante jjbustamante modified the milestones: 0.34.0, 0.35.0 Apr 22, 2024
Signed-off-by: Juan Bustamante <bustamantejj@gmail.com>

Signed-off-by: Natalie Arellano <narellano@vmware.com>
@jjbustamante jjbustamante force-pushed the deps/jjbustamante/update-to-docker-26 branch from 58fd4be to 0daa11f Compare April 22, 2024 18:56
@github-actions github-actions bot modified the milestones: 0.35.0, 0.34.0 Apr 22, 2024
…n was broken in darwin. Thanks Matej

Signed-off-by: Juan Bustamante <jbustamante@vmware.com>
Copy link

codecov bot commented Apr 24, 2024

Codecov Report

Attention: Patch coverage is 95.65217% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 70.19%. Comparing base (32d8db5) to head (fb50e28).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2136      +/-   ##
==========================================
+ Coverage   70.15%   70.19%   +0.04%     
==========================================
  Files         231      233       +2     
  Lines       17227    17259      +32     
==========================================
+ Hits        12084    12113      +29     
- Misses       4360     4362       +2     
- Partials      783      784       +1     
Flag Coverage Δ
os_linux 69.30% <81.09%> (+0.02%) ⬆️
os_macos 65.75% <77.50%> (+0.03%) ⬆️
os_windows 69.68% <91.90%> (ø)
unit 70.19% <95.66%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

darwin. This is important because docker 26 did a refactoring and
safepath.Join is not available for darwin. This is a workaround for now

Signed-off-by: Juan Bustamante <jbustamante@vmware.com>
@jjbustamante jjbustamante force-pushed the deps/jjbustamante/update-to-docker-26 branch from 81c53e9 to 3c6dc12 Compare April 24, 2024 17:08
@jjbustamante jjbustamante marked this pull request as ready for review May 7, 2024 15:51
@jjbustamante jjbustamante requested review from a team as code owners May 7, 2024 15:51
Copy link
Member

@natalieparellano natalieparellano left a comment

Choose a reason for hiding this comment

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

This looks good @jjbustamante. We'll work on getting a lifecycle release out soon so that you can update to that version in go.mod

Signed-off-by: Natalie Arellano <narellano@vmware.com>
@natalieparellano natalieparellano changed the title Updating to Docker 26.x, We need to use a development lifecycle version Updating to Docker 26.x & lifecycle 0.19.4 May 8, 2024
@natalieparellano
Copy link
Member

@jjbustamante I pushed 7cd4e0b to bring the lifecycle up to a released version. When CI goes green we should be good to merge :)

@jjbustamante jjbustamante disabled auto-merge May 8, 2024 17:22
@jjbustamante jjbustamante merged commit d3904d6 into main May 8, 2024
16 checks passed
@jjbustamante jjbustamante deleted the deps/jjbustamante/update-to-docker-26 branch May 8, 2024 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/chore Issue that requests non-user facing changes. type/enhancement Issue that requests a new feature or improvement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants