Skip to content

THREESCALE-11901 - Upgrade to ubi-9#1566

Open
tkan145 wants to merge 5 commits into3scale:masterfrom
tkan145:ubi-9
Open

THREESCALE-11901 - Upgrade to ubi-9#1566
tkan145 wants to merge 5 commits into3scale:masterfrom
tkan145:ubi-9

Conversation

@tkan145
Copy link
Contributor

@tkan145 tkan145 commented Jan 23, 2026

What

https://issues.redhat.com/browse/THREESCALE-11901

Verification steps

  • Checkout this branch
  • Build image
make runtime-image
  • Build CI-image
make dev-build

You should be able to build both images

@tkan145 tkan145 force-pushed the ubi-9 branch 3 times, most recently from febb3cf to 4c10a5d Compare February 2, 2026 06:54
@tkan145 tkan145 marked this pull request as ready for review March 12, 2026 00:28
@tkan145 tkan145 requested a review from a team as a code owner March 12, 2026 00:28
@tkan145 tkan145 force-pushed the ubi-9 branch 5 times, most recently from d3e49cf to c1bece2 Compare March 17, 2026 09:35
akostadinov
akostadinov previously approved these changes Mar 17, 2026
Copy link

@akostadinov akostadinov left a comment

Choose a reason for hiding this comment

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

Hi, I have a few questions to double check things are intentional but it's good to merge as far as I'm concerned. Thank you!

ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
ARG LUAROCKS_VERSION="3.11.1"
ARG JAEGERTRACING_CPP_CLIENT_RPM_VERSION="0.3.1-13.el8"
ARG OPENRESTY_RPM_VERSION="1.21.4-4.el9"

Choose a reason for hiding this comment

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

I wonder why do we use 1.21.4-4 here but we have upgraded to 1.21.4-5 in the images. I assume RHEL may have additional patches not reflected in the version number, just wanted to point that out in case it is relevant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OPENRESTY_RPM_VERSION refers to the version of the custom RPM built midstream and uploaded to the 3scale S3 bucket for upstream consumption. 1.21.4-5 is the CI image version. These two versions are independent, as it is sometimes necessary to rebuild the CI image without updating the RPMs.

Dockerfile Outdated

RUN dnf install -y 'dnf-command(config-manager)'
RUN microdnf update -y \
&& microdnf install -y 'yum-utils' dnf

Choose a reason for hiding this comment

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

microdnf supports the --nodocs flag in case we want to keep --setopt=tsflags=nodocs like before

just a nitpick, fine with me either way

btw we may just use microdnf without yum utils and dnf I think. The repo can be added just by downloading a file, no need for yum-config-manager. Again just an idea, it's fine with me as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've switched to using microdnf, and I want to keep yum-config-manager instead of having to use curl to copy files to the correct directory, since we'll delete it later anyway.

 RUN microdnf -y remove yum-utils luarocks \

&& make build \
&& make install \
&& luarocks install luaossl 20200709 --tree ${APP_ROOT}/lua_modules CFLAGS="-O2 -fPIC -DHAVE_EVP_KDF_CTX=1" \
# && luarocks install luaossl 20200709 --tree ${APP_ROOT}/lua_modules CFLAGS="-O2 -fPIC -DHAVE_EVP_KDF_CTX=1" \

Choose a reason for hiding this comment

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

Is this intentionally commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it was intentional; luaossl 20200709 conflicts with the version provided by RHEL9, but I left it there in case I needed to pin the luaossl version again.

akostadinov
akostadinov previously approved these changes Mar 18, 2026
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