Skip to content

feat(CLOUDDST-32565):Upgrade Dockerfiles to UBI9 - #1336

Merged
JAVGan merged 4 commits into
mainfrom
upgrade_ubi
Jun 2, 2026
Merged

JAVGan merged 4 commits into
mainfrom
upgrade_ubi

Conversation

@JAVGan

@JAVGan JAVGan commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Upgrade Dockerfiles to UBI9

This PR aims to upgrade the existing Dockerfiles for IIB's API and worker to the currently latest version of UBI which is the UBI9.

It also fix some issues in the existing Dockerfiles in order to make IIB work in the new UBI version.

JAVGan added 2 commits June 2, 2026 16:40
This commit upgrades the UBI images in the IIB's Dockerfiles from UBI8
to UBI9, which is the currently latest supported one.

Refers to CLOUDDST-32565

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>
From `docker-compose` build:

```
1.544 Error:
1.544  Problem: problem with installed package curl-minimal-7.76.1-40.el9.x86_64
1.544   - package curl-minimal-7.76.1-40.el9.x86_64 from @System conflicts with curl provided by curl-7.76.1-40.el9.x86_64 from ubi-9-baseos-rpms
1.544   - package curl-minimal-7.76.1-40.el9.x86_64 from ubi-9-baseos-rpms conflicts with curl provided by curl-7.76.1-40.el9.x86_64 from ubi-9-baseos-rpms
1.544   - conflicting requests
1.544 (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages)
------

```

We may stick with the installed version `curl-minimal` from UBI9 hence
removing `curl` from installer

Refers to CLOUDDST-32565

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>
@JAVGan
JAVGan changed the base branch from master to main June 2, 2026 20:24
JAVGan added 2 commits June 2, 2026 17:31
This commit changes the `update-alternatives` command to install the
aliases for `python3` and `pip3` as those aren't present by default on
UBI9, raising the error below:

```
 => ERROR [iib-api 4/9] RUN update-alternatives --set python3 $(which python3.12)                                                                                                                                                                                                     0.2s

------

 > [iib-api 4/9] RUN update-alternatives --set python3 $(which python3.12):

0.148 cannot access /var/lib/alternatives/python3: No such file or directory
```

Refers to CLOUDDST-32565

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>
Remove no longer necessary pip upgrade after the installation from the
package manager as we're now on UBI9

Refers to CLOUDDST-32565

Signed-off-by: Jonathan Gangi <jgangi@redhat.com>

@chandwanitulsi chandwanitulsi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!
Why do we have changes detected in konflux-ca.crt?

@JAVGan

JAVGan commented Jun 2, 2026 •

Copy link
Copy Markdown
Contributor Author

LGTM! Why do we have changes detected in konflux-ca.crt?

Probably due to my first attempt to open this PR which I accidentally marked master instead of main, then I edited the PR to change the bases and GitHub probably wen't a bit mad, but so far my commits doesn't change that file.

@yashvardhannanavati

Copy link
Copy Markdown
Collaborator

/agentic_review

@qodo-for-release-engineering

qodo-for-release-engineering Bot commented Jun 2, 2026 •

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (1) 📘 Rule violations (0) 🔗 Cross-repo conflicts (0)

Grey Divider


Action required

1. Implicit curl dependency 🐞 Bug ☼ Reliability
Description
docker/Dockerfile-workers invokes curl to download required binaries, but the Dockerfile no longer
installs curl, so builds now rely on curl being present in the UBI9 base image and can fail when
it’s absent/changed. This makes the worker image build non-reproducible and fragile to base-image
updates.
Code

docker/Dockerfile-workers[14]

Evidence
The worker image’s package install list does not include curl, yet later build steps invoke curl to
download multiple binaries, so curl is an undeclared build dependency.

docker/Dockerfile-workers[6-28]
docker/Dockerfile-workers[32-36]
docker/Dockerfile-workers[54-60]

Agent prompt
The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
`docker/Dockerfile-workers` uses `curl` multiple times, but the PR removed `curl` from the explicit `dnf install` list. This makes the build depend on whatever happens to be present in the base image.

### Issue Context
The Dockerfile downloads opm/operator-sdk and other tooling with `curl`, so curl must be guaranteed to exist.

### Fix Focus Areas
- docker/Dockerfile-workers[6-28]
- docker/Dockerfile-workers[32-60]

### Suggested fix
- Add an explicit package providing the `curl` binary back to the install list (e.g., `curl` or `curl-minimal`, depending on your standard).
- Keep it near other build-time tooling so the dependency is obvious.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


Grey Divider

Qodo Logo

Comment thread docker/Dockerfile-workers Resolved
@JAVGan
JAVGan merged commit 8ba3c0c into main Jun 2, 2026
3 checks passed
@JAVGan
JAVGan deleted the upgrade_ubi branch June 2, 2026 23:46
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.

4 participants