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

Upgrade pulp-web image to latest nginx image #703

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

gerrod3
Copy link
Collaborator

@gerrod3 gerrod3 commented Jan 2, 2025

& fix publishing both arm+amd variants

fixes: #644
fixes: #702

Copy link
Member

@bmbouter bmbouter left a comment

Choose a reason for hiding this comment

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

This all looks good to me!

@gerrod3 gerrod3 merged commit 02ebce2 into pulp:latest Jan 3, 2025
6 checks passed
@gerrod3 gerrod3 deleted the arm-nginx-web branch January 3, 2025 21:54
Copy link

patchback bot commented Jan 6, 2025

Backport to 3.63: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.63/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703

Backported as #704

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

patchback bot pushed a commit that referenced this pull request Jan 6, 2025
Upgrade pulp-web image to latest nginx image

(cherry picked from commit 02ebce2)
gerrod3 added a commit that referenced this pull request Jan 6, 2025
…9ef7332d39f3a5be6418cc2106d193/pr-703

[PR #703/02ebce22 backport][3.63] Upgrade pulp-web image to latest nginx image
Copy link

patchback bot commented Jan 6, 2025

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

❌ Failed to cleanly apply 02ebce2 on top of patchback/backports/3.28/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703

Backporting merged PR #703 into latest

  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.28/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703 upstream/3.28
  4. Now, cherry-pick PR Upgrade pulp-web image to latest nginx image  #703 contents into that branch:
    $ git cherry-pick -x 02ebce228d9ef7332d39f3a5be6418cc2106d193
    If it'll yell at you with something like fatal: Commit 02ebce228d9ef7332d39f3a5be6418cc2106d193 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 02ebce228d9ef7332d39f3a5be6418cc2106d193
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upgrade pulp-web image to latest nginx image  #703 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.28/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703
  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.

Copy link

patchback bot commented Jan 6, 2025

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

❌ Failed to cleanly apply 02ebce2 on top of patchback/backports/3.22/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703

Backporting merged PR #703 into latest

  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.22/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703 upstream/3.22
  4. Now, cherry-pick PR Upgrade pulp-web image to latest nginx image  #703 contents into that branch:
    $ git cherry-pick -x 02ebce228d9ef7332d39f3a5be6418cc2106d193
    If it'll yell at you with something like fatal: Commit 02ebce228d9ef7332d39f3a5be6418cc2106d193 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 02ebce228d9ef7332d39f3a5be6418cc2106d193
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Upgrade pulp-web image to latest nginx image  #703 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.22/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703
  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.

Copy link

patchback bot commented Jan 6, 2025

Backport to 3.39: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.39/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703

Backported as #706

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

Copy link

patchback bot commented Jan 6, 2025

Backport to 3.49: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.49/02ebce228d9ef7332d39f3a5be6418cc2106d193/pr-703

Backported as #705

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

patchback bot pushed a commit that referenced this pull request Jan 6, 2025
Upgrade pulp-web image to latest nginx image

(cherry picked from commit 02ebce2)
patchback bot pushed a commit that referenced this pull request Jan 6, 2025
Upgrade pulp-web image to latest nginx image

(cherry picked from commit 02ebce2)
gerrod3 added a commit that referenced this pull request Jan 6, 2025
…9ef7332d39f3a5be6418cc2106d193/pr-703

[PR #703/02ebce22 backport][3.49] Upgrade pulp-web image to latest nginx image
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.

Pulp-web is only available for arm64 on DockerHub and Quay.io Build the pulp-web for arm64 architecture
2 participants