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

feature(main): using sreg 0.1.4 build image #4023

Merged
merged 1 commit into from
Oct 7, 2023

Conversation

cuisongliu
Copy link
Collaborator

@cuisongliu cuisongliu commented Sep 29, 2023

🤖 Generated by Copilot at 794d47f

Summary

📝🌐🐛

This pull request enhances the cluster image building feature of sealos by allowing users to use image manifests or tarballs as sources of images, instead of Dockerfiles. It also updates the documentation and the translations to reflect this change, and upgrades a dependency to a newer version. The main files affected are docs/4.0/docs/lifecycle-management/operations/build-image/build-image-image_list.md, pkg/buildah/imagesaver.go, and go.mod.

Sing, O Muse, of the skillful pull request
That changed the way of building cluster images
With image manifests and tarballs, not Dockerfiles
And updated the docs in both tongues of the sages

Walkthrough

  • Update the document on building cluster images to use image manifests or tarballs instead of Dockerfiles (link, link, link, link, link)
  • Add the Chinese translation of the updated document on building cluster images (link, link)
  • Delete the obsolete document on building with image list (link)
  • Update the dependency on github.com/labring/sreg to v0.1.4 in go.mod and go.work.sum files (link, link)
  • Modify the runSaveImages function in pkg/buildah/imagesaver.go to handle both images and tars slices and use different image savers for them (link, link)

@sealos-ci-robot
Copy link
Member

🤖 Generated by lychee action

Summary

Status Count
🔍 Total 973
✅ Successful 400
⏳ Timeouts 0
🔀 Redirected 0
👻 Excluded 572
❓ Unknown 0
🚫 Errors 0

Full action output

Full Github Actions output

@codecov
Copy link

codecov bot commented Sep 29, 2023

Codecov Report

All modified lines are covered by tests ✅

📢 Thoughts on this report? Let us know!.

@zzjin zzjin merged commit 3c8c639 into labring:main Oct 7, 2023
@sealos-ci-robot
Copy link
Member

/cherry-pick release-v4.4

@sealos-ci-robot
Copy link
Member

🤖 says: Error cherry-picking.

Auto-merging docs/4.0/docs/lifecycle-management/operations/build-image/build-image-image_list.md
CONFLICT (content): Merge conflict in docs/4.0/docs/lifecycle-management/operations/build-image/build-image-image_list.md
Auto-merging docs/4.0/docs/lifecycle-management/reference/sealos/commands/build.md
CONFLICT (content): Merge conflict in docs/4.0/docs/lifecycle-management/reference/sealos/commands/build.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
error: could not apply 3c8c639... feature(main): using sreg 0.1.4 build image (#4023)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@sealos-ci-robot
Copy link
Member

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/6438542822

cuisongliu added a commit to cuisongliu/sealos that referenced this pull request Oct 7, 2023
Signed-off-by: cuisongliu <[email protected]>

(cherry picked from commit 3c8c639)
Signed-off-by: cuisongliu <[email protected]>
sealos-ci-robot pushed a commit that referenced this pull request Oct 7, 2023
(cherry picked from commit 3c8c639)

Signed-off-by: cuisongliu <[email protected]>
sealos-ci-robot pushed a commit that referenced this pull request Oct 7, 2023
(cherry picked from commit 3c8c639)

Signed-off-by: cuisongliu <[email protected]>
cuisongliu added a commit that referenced this pull request Oct 7, 2023
(cherry picked from commit 3c8c639)

Signed-off-by: cuisongliu <[email protected]>
Co-authored-by: cuisongliu <[email protected]>
bxy4543 pushed a commit to bxy4543/sealos that referenced this pull request Oct 13, 2023
@cuisongliu cuisongliu deleted the upgrade_sreg_0.1.4 branch November 2, 2023 07:08
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