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(deps): update dockerfile images (non-major) #2226

Merged

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jan 21, 2025

This PR contains the following updates:

Package Type Update Change
docker/dockerfile syntax minor 1.7-labs -> 1.13-labs
registry.access.redhat.com/ubi9/nodejs-20 stage patch 9.5-1733148170 -> 9.5-1737421648
registry.access.redhat.com/ubi9/nodejs-20 stage patch 9.5-1736455676 -> 9.5-1737421648
registry.access.redhat.com/ubi9/nodejs-20-minimal final patch 9.5-1730525319 -> 9.5-1737531030
registry.access.redhat.com/ubi9/nodejs-20-minimal final patch 9.5-1736729465 -> 9.5-1737531030

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.


  • If you want to rebase/retry this PR, check this box

This PR was generated by Mend Renovate. View the repository job log.

Copy link

openshift-ci bot commented Jan 21, 2025

Hi @renovate[bot]. Thanks for your PR.

I'm waiting for a redhat-developer member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@kim-tsao
Copy link
Member

/ok-to-test

Copy link
Contributor

@renovate renovate bot force-pushed the renovate/dockerfile-dockerfile-images-(non-major) branch from 07c8c7c to 5892595 Compare January 22, 2025 12:30
Copy link
Contributor

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate renovate bot force-pushed the renovate/dockerfile-dockerfile-images-(non-major) branch from 5892595 to c3c6bc4 Compare January 22, 2025 13:51
Copy link
Contributor

@kim-tsao
Copy link
Member

/lgtm
/approve

Copy link

openshift-ci bot commented Jan 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kim-tsao

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

The pull request process is described 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

@kim-tsao
Copy link
Member

/cherrypick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@kim-tsao: once the present PR merges, I will cherry-pick it on top of release-1.4 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.4

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 1cb56cd into main Jan 22, 2025
12 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the renovate/dockerfile-dockerfile-images-(non-major) branch January 22, 2025 14:56
@openshift-cherrypick-robot
Copy link
Contributor

@kim-tsao: #2226 failed to apply on top of branch "release-1.4":

Applying: chore(deps): update dockerfile images (non-major)
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
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(deps): update dockerfile images (non-major)

In response to this:

/cherrypick release-1.4

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.

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.

2 participants