Add an option to retag rather than replacing the target image while rebasing #2023

Parthiba-Hazra · 2024-01-11T18:44:00Z

Resolves #1748

natalieparellano

@Parthiba-Hazra thank you for picking this up! I think unfortunately the requirements were not too clearly specified in the original issue - I left some suggestions below. Let us know what you think :)

internal/commands/rebase.go

pkg/client/rebase.go

codecov · 2024-01-24T15:22:29Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.72%. Comparing base (667bf4f) to head (ced704f).
Report is 12 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2023      +/-   ##
==========================================
+ Coverage   79.69%   79.72%   +0.04%     
==========================================
  Files         176      176              
  Lines       13257    13263       +6     
==========================================
+ Hits        10564    10573       +9     
+ Misses       2023     2021       -2     
+ Partials      670      669       -1

Flag	Coverage Δ
os_linux	`78.64% <100.00%> (+0.04%)`	⬆️
os_macos	`76.36% <100.00%> (+0.04%)`	⬆️
os_windows	`79.11% <100.00%> (+0.04%)`	⬆️
unit	`79.72% <100.00%> (+0.04%)`	⬆️

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

…ebasing Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> add an option to "retag" rather than replacing the target image while rebasing Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

Signed-off-by: Rizul Gupta <mail2rizul@gmail.com>

Co-authored-by: Natalie Arellano <narellano@vmware.com> Signed-off-by: Rizul Gupta <112455393+rizul2108@users.noreply.github.com>

During builder creation, end-users can provide the flag `--flatten` with the buildpacks they want to put in one layer. Signed-off-by: Juan Bustamante <jbustamante@vmware.com>

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

… purpose. If previous-image flag set then workingImage will be based off of opts.PreviousImage in the rebaser.Rebase Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> fix merge conflicts Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> resolve merge conflict Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

internal/commands/rebase.go

pkg/client/rebase.go

natalieparellano

@Parthiba-Hazra thank you for this! I left a couple nits, but overall this looks good :)

Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> update documentation for PreviousImage filed in RebaseOptions Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> update docs Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

jjbustamante · 2024-02-02T13:36:44Z

pkg/client/rebase.go

+		repoName = opts.PreviousImage
+	}
+
+	appImage, err := c.imageFetcher.Fetch(ctx, repoName, image.FetchOptions{Daemon: !opts.Publish, PullPolicy: opts.PullPolicy})


@Parthiba-Hazra

Could you add some test coverage for this method?

yes sure, let me check.

@jjbustamante can you check if I am missing some other scenarios.

Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

jjbustamante · 2024-03-05T18:04:16Z

Manual Test

I created a spring boot app using the initializr
I used the latest pack version to publish the app image into my dockerhub account pack build jbustamantevmware/my-spring-app --publish, I am using paketobuildpacks/builder-jammy-base as my default builder.
The app was published correctly
I compiled this feature branch
I ran pack rebase using the new --previous-image flag

> git:(retag) out/pack rebase --previous-image jbustamantevmware/my-spring-app:latest jbustamantevmware/my-spring-app:sometag --publish
Rebasing jbustamantevmware/my-spring-app:latest on run image index.docker.io/paketobuildpacks/run-jammy-base:latest
Saving jbustamantevmware/my-spring-app:sometag...
*** Images (sha256:ca7d958efd12d2b9c409e803d4f5b78dc9496ba1c1d3457a8f25103956f8a8e4):
      jbustamantevmware/my-spring-app:sometag
Rebased Image: index.docker.io/jbustamantevmware/my-spring-app@sha256:ca7d958efd12d2b9c409e803d4f5b78dc9496ba1c1d3457a8f25103956f8a8e4
Successfully rebased image jbustamantevmware/my-spring-app:sometag

As we can see a new tag was created for my application

jjbustamante

@Parthiba-Hazra Thank you so much for this!

Parthiba-Hazra requested review from a team as code owners January 11, 2024 18:44

github-actions bot added the type/enhancement Issue that requests a new feature or improvement. label Jan 11, 2024

github-actions bot added this to the 0.33.0 milestone Jan 11, 2024

natalieparellano reviewed Jan 22, 2024

View reviewed changes

internal/commands/rebase.go Outdated Show resolved Hide resolved

pkg/client/rebase.go Outdated Show resolved Hide resolved

jjbustamante modified the milestones: 0.33.0, 0.34.0 Jan 24, 2024

jjbustamante mentioned this pull request Jan 24, 2024

Adding --label flag to pack builder create command #2034

Merged

2 tasks

github-actions bot modified the milestones: 0.34.0, 0.33.0 Jan 29, 2024

Parthiba-Hazra force-pushed the retag branch from 36cd02a to 5a52b48 Compare January 29, 2024 14:57

github-actions bot added the type/chore Issue that requests non-user facing changes. label Jan 29, 2024

Parthiba-Hazra and others added 7 commits January 29, 2024 20:31

add an option to retag rather than replacing the target image while r…

f46c541

…ebasing Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> add an option to "retag" rather than replacing the target image while rebasing Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

change help text of --publish

da19388

Signed-off-by: Rizul Gupta <mail2rizul@gmail.com>

Update internal/commands/rebase.go

ad48748

Co-authored-by: Natalie Arellano <narellano@vmware.com> Signed-off-by: Rizul Gupta <112455393+rizul2108@users.noreply.github.com>

Implementing RFC-0123

c571998

During builder creation, end-users can provide the flag `--flatten` with the buildpacks they want to put in one layer. Signed-off-by: Juan Bustamante <jbustamante@vmware.com>

adding feedback from review

ef68692

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

Moves lifecycle package to phase

e1a4d00

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

Parthiba-Hazra force-pushed the retag branch from 5a52b48 to b7d6bc0 Compare January 29, 2024 15:15

jjbustamante modified the milestones: 0.33.0, 0.34.0 Jan 29, 2024

github-actions bot modified the milestones: 0.34.0, 0.33.0 Jan 29, 2024

github-actions bot removed the type/chore Issue that requests non-user facing changes. label Jan 29, 2024

Parthiba-Hazra requested a review from natalieparellano January 29, 2024 15:38

Parthiba-Hazra force-pushed the retag branch from 051d86d to 514c4f7 Compare January 29, 2024 15:47

jjbustamante modified the milestones: 0.33.0, 0.34.0 Feb 1, 2024

natalieparellano reviewed Feb 1, 2024

View reviewed changes

internal/commands/rebase.go Outdated Show resolved Hide resolved

natalieparellano reviewed Feb 1, 2024

View reviewed changes

pkg/client/rebase.go Outdated Show resolved Hide resolved

github-actions bot modified the milestones: 0.34.0, 0.33.0 Feb 1, 2024

jjbustamante modified the milestones: 0.33.0, 0.34.0 Feb 1, 2024

natalieparellano reviewed Feb 1, 2024

View reviewed changes

fix merge conflicts

c6749c7

Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> update documentation for PreviousImage filed in RebaseOptions Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com> update docs Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

Parthiba-Hazra force-pushed the retag branch from daa4e4f to c6749c7 Compare February 2, 2024 12:26

github-actions bot modified the milestones: 0.34.0, 0.33.0 Feb 2, 2024

jjbustamante modified the milestones: 0.33.0, 0.34.0 Feb 2, 2024

jjbustamante reviewed Feb 2, 2024

View reviewed changes

add test cases for new changes in Rebase function

d7559e2

Signed-off-by: Parthiba-Hazra <parthibahazra@gmail.com>

github-actions bot modified the milestones: 0.34.0, 0.33.0 Feb 2, 2024

jjbustamante modified the milestones: 0.33.0, 0.34.0 Feb 2, 2024

Parthiba-Hazra requested review from natalieparellano and jjbustamante March 3, 2024 18:25

jjbustamante approved these changes Mar 6, 2024

View reviewed changes

Merge branch 'main' into retag

a584b7d

jjbustamante enabled auto-merge March 8, 2024 14:49

Merge branch 'main' into retag

ced704f

jjbustamante merged commit 2a15554 into buildpacks:main Mar 8, 2024
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add an option to retag rather than replacing the target image while rebasing #2023

Add an option to retag rather than replacing the target image while rebasing #2023

Parthiba-Hazra commented Jan 11, 2024 •

edited by jjbustamante

Loading

natalieparellano left a comment

codecov bot commented Jan 24, 2024 •

edited

Loading

natalieparellano left a comment

jjbustamante Feb 2, 2024

Parthiba-Hazra Feb 2, 2024

Parthiba-Hazra Feb 2, 2024

jjbustamante commented Mar 5, 2024

jjbustamante left a comment

Add an option to retag rather than replacing the target image while rebasing #2023

Add an option to retag rather than replacing the target image while rebasing #2023

Conversation

Parthiba-Hazra commented Jan 11, 2024 • edited by jjbustamante Loading

natalieparellano left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 24, 2024 • edited Loading

Codecov Report

natalieparellano left a comment

Choose a reason for hiding this comment

jjbustamante Feb 2, 2024

Choose a reason for hiding this comment

Parthiba-Hazra Feb 2, 2024

Choose a reason for hiding this comment

Parthiba-Hazra Feb 2, 2024

Choose a reason for hiding this comment

jjbustamante commented Mar 5, 2024

Manual Test

jjbustamante left a comment

Choose a reason for hiding this comment

Parthiba-Hazra commented Jan 11, 2024 •

edited by jjbustamante

Loading

codecov bot commented Jan 24, 2024 •

edited

Loading