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

chore(docker): update dockerfile base... #1928

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Conversation

nickboldt
Copy link
Member

What does this PR do?

chore(docker): update dockerfile base images

Signed-off-by: Nick Boldt nboldt@redhat.com

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

N/A (or see commit message above for issue number)

How to test this PR?

N/A

PR Checklist

As the author of this Pull Request I made sure that:

  • Code produced is complete
  • Code builds without errors
  • Tests are covering the bugfix
  • Relevant user documentation updated
  • Relevant contributing documentation updated

Reviewers

Reviewers, please comment how you tested the PR when approving it.

Signed-off-by: Nick Boldt <nboldt@redhat.com>
@nickboldt nickboldt requested a review from a team as a code owner November 14, 2024 17:20
Copy link

openshift-ci bot commented Nov 14, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from nickboldt. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

sonarcloud bot commented Nov 14, 2024

@nickboldt nickboldt merged commit 409453c into release-1.3 Nov 14, 2024
5 of 7 checks passed
@nickboldt nickboldt deleted the bump-dockerfile branch November 14, 2024 17:22
@nickboldt
Copy link
Member Author

/cherry-pick 1.2.x
/cherry-pick main

@openshift-cherrypick-robot

@nickboldt: #1928 failed to apply on top of branch "1.2.x":

Applying: chore(docker): update dockerfile base images
Using index info to reconstruct a base tree...
M	.rhdh/docker/Dockerfile
M	docker/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging docker/Dockerfile
CONFLICT (content): Merge conflict in docker/Dockerfile
Auto-merging .rhdh/docker/Dockerfile
CONFLICT (content): Merge conflict in .rhdh/docker/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore(docker): update dockerfile base images

In response to this:

/cherry-pick 1.2.x
/cherry-pick main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Contributor

The image is available at: quay.io/janus-idp/backstage-showcase:pr-1928!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants