search

pulp / pulp-oci-images

Containerfiles and other assets for building Pulp 3 OCI images
https://docs.pulpproject.org/pulp_oci_images/
30 stars 55 forks source link

Update CentOS 8 containers for the distro's EOL #635

Closed mikedep333 closed 3 months ago

mikedep333 commented 3 months ago

Fixes: #634

patchback[bot] commented 3 months ago

Backport to 3.21: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d83cdcc9473c0200754fdf5d76441b0e30baff4f on top of patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635

Backporting merged PR #635 into 3.39

  1. Ensure you have a local repo clone of your fork. Unless you cloned it from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these instructions you'll refer to it by the name upstream. If you don't have it, here's how you can add it: 
    $ git remote add upstream https://github.com/pulp/pulp-oci-images.git
  3. Ensure you have the latest copy of upstream and prepare a branch that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635 upstream/3.21
  4. Now, cherry-pick PR #635 contents into that branch: 
    $ git cherry-pick -x d83cdcc9473c0200754fdf5d76441b0e30baff4f

    If it'll yell at you with something like fatal: Commit d83cdcc9473c0200754fdf5d76441b0e30baff4f is a merge but no -m option was given., add -m 1 as follows instead:

    $ git cherry-pick -m1 -x d83cdcc9473c0200754fdf5d76441b0e30baff4f
  5. At this point, you'll probably encounter some merge conflicts. You must resolve them in to preserve the patch from PR #635 as close to the original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/3.21/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635
  7. Create a PR, ensure that the CI is green. If it's not — update it so that the tests and any other checks pass. This is it! Now relax and wait for the maintainers to process your pull request when they have some cycles to do reviews. Don't worry — they'll tell you if any improvements are necessary when the time comes!

🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.

patchback[bot] commented 3 months ago

Backport to 3.22: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.22/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635

Backported as https://github.com/pulp/pulp-oci-images/pull/636

🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.

patchback[bot] commented 3 months ago

Backport to 3.28: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.28/d83cdcc9473c0200754fdf5d76441b0e30baff4f/pr-635

Backported as https://github.com/pulp/pulp-oci-images/pull/637

🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.