add distgen support by ndavidova · Pull Request #437 · sclorg/mysql-container

ndavidova · 2026-05-28T13:01:35Z

No description provided.

ndavidova · 2026-05-28T13:01:41Z

[test]

github-actions · 2026-05-28T13:02:06Z

Pull Request validation

Failed

🔴 Failed or pending statuses:

Testing Farm - RHEL9 - Unsubscribed host - 8.0[error]
Testing Farm - RHEL9 - 8.4[error]
Testing Farm - Fedora - 8.4[error]

🔴 Review - Missing review from a member (1 required)

Triggered by Workflow Run

github-actions · 2026-05-28T13:15:04Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
Fedora - 8.4	Fedora-latest	x86_64	✅ passed	28.05.2026 13:02:53	10min 10s	test pipeline

github-actions · 2026-05-28T13:15:04Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
Fedora - 8.0	Fedora-latest	x86_64	✅ passed	01.06.2026 10:09:06	9min 53s	test pipeline
CentOS Stream 9 - 8.4	CentOS-Stream-9	x86_64	✅ passed	01.06.2026 10:09:06	15min 26s	test pipeline
CentOS Stream 10 - 8.4	CentOS-Stream-10	x86_64	✅ passed	01.06.2026 10:09:05	14min 15s	test pipeline
RHEL10 - Unsubscribed host - 8.4	RHEL-10.2-Nightly	x86_64	✅ passed	01.06.2026 10:09:04	53min 14s	test pipeline
RHEL10 - 8.4	RHEL-10.2-Nightly	x86_64	✅ passed	01.06.2026 10:09:05	53min 51s	test pipeline
RHEL8 - 8.0	RHEL-8.10.0-Nightly	x86_64	❌ error	01.06.2026 10:09:05	41min 27s	test pipeline
RHEL9 - Unsubscribed host - 8.0	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:09:06	55min 59s	test pipeline
RHEL9 - Unsubscribed host - 8.4	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:09:05	56min 18s	test pipeline
RHEL9 - 8.0	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:09:04	56min 32s	test pipeline
RHEL9 - 8.4	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:09:05	56min 29s	test pipeline
Fedora - 8.4	Fedora-latest	x86_64	✅ passed	09.06.2026 13:49:58	13min 12s	test pipeline
CentOS Stream 9 - 8.0	CentOS-Stream-9	x86_64	✅ passed	01.06.2026 10:09:08	13min 48s	test pipeline

ndavidova · 2026-05-28T14:50:47Z

[test]

pkhartsk · 2026-06-01T08:00:00Z

Would it also make sense to include the s2i-common directories in the sources? Or just make them symlinks to the one already present in the project root

pkhartsk

Found some possible simplifications of the (IMO) very complicated src/Dockerfile

pkhartsk · 2026-05-29T12:02:26Z

+{% if spec.prod == 'fedora' %}# This image must forever use UID 27 for mysql user so our volumes are safe in the future. This should *never* change.
+# Instead of relying on the DB server package, we will do the setup ourselves before any package is installed
+{% else %}# This image must forever use UID 27 for mysql user so our volumes are
+# safe in the future. This should *never* change, the last test is there
+# to make sure of that.


Seems useless to do this

I'm aware that this would cause the dockerfiles to differ cosmetically, but functionally they remain the same, and this is just pretty much the same comment...

pkhartsk · 2026-06-01T08:10:14Z

+      io.k8s.display-name="MySQL ${MYSQL_VERSION}" \
+      io.openshift.expose-services="3306:mysql" \
+      io.openshift.tags="database,${NAME},${NAME}${MYSQL_SHORT_VERSION}{% if spec.prod == 'fedora' and spec.version == '8.0' %},rh-${NAME}${MYSQL_SHORT_VERSION}{% elif spec.prod != 'fedora' %},${NAME}-${MYSQL_SHORT_VERSION}{% endif %}" \
+      com.redhat.component="{% if spec.prod == 'rhel8' or spec.prod == 'rhel9' or spec.prod == 'rhel10' or spec.prod == 'c9s' or spec.prod == 'c10s' %}${NAME}-${MYSQL_SHORT_VERSION}-container{% else %}${NAME}{% endif %}" \


Can be simplified to if spec.prod != 'fedora'

pkhartsk · 2026-06-01T08:12:10Z

+      com.redhat.component="{% if spec.prod == 'rhel8' or spec.prod == 'rhel9' or spec.prod == 'rhel10' or spec.prod == 'c9s' or spec.prod == 'c10s' %}${NAME}-${MYSQL_SHORT_VERSION}-container{% else %}${NAME}{% endif %}" \
+      name="{{ spec.img_name }}" \
+{% if spec.prod == 'fedora' %}      version="${MYSQL_VERSION}" \
+{% elif spec.prod != 'rhel10' %}      version="1" \


This makes no sense to me, why would the version be 1? Shouldn't it always be MYSQL_VERSION? Guessing this is a mistake in the .rhelx Dockerfiles?

pkhartsk · 2026-06-01T08:13:04Z

+{% endif %}{% if spec.license_terms %}      com.redhat.license_terms="{{ spec.license_terms }}" \
+{% endif %}      usage="{% if spec.prod == 'c9s' or spec.prod == 'c10s' %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}:{{ spec.prod }}{% elif spec.prod == 'fedora' %}docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}{% else %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 {{ spec.img_name }}{% endif %}" \


nit: these endif's at the starts of lines are ugly

pkhartsk · 2026-06-01T08:18:30Z

+{% elif spec.prod == 'rhel8' and spec.version == '8.0' %}RUN yum -y module enable mysql:$MYSQL_VERSION && \
+    INSTALL_PKGS="{{ spec.pkgs }}" && \
+    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
+    yum -y clean all --enablerepo='*' && \
+    mkdir -p /var/lib/mysql/data && chown -R mysql.0 /var/lib/mysql && \
+    test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"
+{% elif (spec.prod == 'rhel9' or spec.prod == 'c9s') and spec.version == '8.4' %}RUN yum -y module enable ${NAME}:${MYSQL_VERSION} && \
+    INSTALL_PKGS="{{ spec.pkgs }}" && \
+    dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
+    dnf -y clean all --enablerepo='*' && \
+    mkdir -p ${HOME}/data && chown -R mysql:{{ spec.chown_group }} ${HOME} && \
+    test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"
+{% elif spec.version == '8.0' %}RUN INSTALL_PKGS="{{ spec.pkgs }}" && \
+    yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
+    yum -y clean all --enablerepo='*' && \
+    mkdir -p ${HOME}/data && chown -R mysql.0 ${HOME} && \
+    test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"


These modular installs seem very similar, maybe the if can be divided into something like
if spec.prod in ['rhel8', ... 'c9s'] for modules where the module is enabled, and then a more common way to install the packages?

pkhartsk · 2026-06-01T08:21:54Z

+{% if spec.prod == 'rhel8' and spec.version == '8.0' %}COPY {{ spec.version }}/root-common /
+COPY {{ spec.version }}/s2i-common/bin/ $STI_SCRIPTS_PATH
+COPY {{ spec.version }}/root /
+{% else %}COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
+{% endif %}


Aren't these the exact same?

pkhartsk · 2026-06-01T08:22:20Z

+{% if spec.prod == 'rhel8' and spec.version == '8.0' %}RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
+{% else %}RUN ln -s /bin/run-mysqld ${STI_SCRIPTS_PATH}/run
+{% endif %}


Also the exact same.

pkhartsk · 2026-06-01T08:22:41Z

+{% if spec.prod == 'rhel8' and spec.version == '8.0' %}RUN rm -rf /etc/my.cnf.d/* && \
+    /usr/libexec/container-setup && \
+    rpm-file-permissions && \
+    /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION"
+{% else %}RUN rm -rf /etc/my.cnf.d/* && \
+    /usr/libexec/container-setup && \
+    rpm-file-permissions && \
+    /usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}"
+{% endif %}


Also the exact same.

pkhartsk · 2026-06-01T08:25:19Z

+{% if spec.prod == 'rhel8' and spec.version == '8.0' %}ENV MYSQL_VERSION={{ spec.version }} \
+    APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql
+
+ENV SUMMARY="MySQL {{ spec.version }} SQL database server" \
+    DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
+image provides a containerized packaging of the MySQL mysqld daemon and client application. \
+The mysqld server daemon accepts connections from clients and provides access to content from \
+MySQL databases on behalf of the clients."
+
+LABEL summary="$SUMMARY" \
+      description="$DESCRIPTION" \
+      io.k8s.description="$DESCRIPTION" \
+      io.k8s.display-name="MySQL {{ spec.version }}" \
+      io.openshift.expose-services="3306:mysql" \
+      io.openshift.tags="database,mysql,mysql{{ spec.short }},mysql-{{ spec.short }}" \
+      com.redhat.component="mysql-{{ spec.short }}-container" \
+      name="{{ spec.img_name }}" \
+      version="1" \
+{% if spec.license_terms %}      com.redhat.license_terms="{{ spec.license_terms }}" \
+{% endif %}      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 {{ spec.img_name }}" \
+      maintainer="SoftwareCollections.org <[email protected]>"
+{% else %}# Standalone ENV call so these values can be re-used in the other ENV calls
+ENV MYSQL_VERSION={{ spec.version }} \
+    MYSQL_SHORT_VERSION={{ spec.short }}
+
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+    DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
+image provides a containerized packaging of the MySQL mysqld daemon and client application. \
+The mysqld server daemon accepts connections from clients and provides access to content from \
+MySQL databases on behalf of the clients."
+
+LABEL summary="${SUMMARY}" \
+      description="${DESCRIPTION}" \
+      io.k8s.description="${DESCRIPTION}" \
+      io.k8s.display-name="MySQL ${MYSQL_VERSION}" \
+      io.openshift.expose-services="3306:mysql" \
+      io.openshift.tags="database,${NAME},${NAME}${MYSQL_SHORT_VERSION}{% if spec.prod == 'fedora' and spec.version == '8.0' %},rh-${NAME}${MYSQL_SHORT_VERSION}{% elif spec.prod != 'fedora' %},${NAME}-${MYSQL_SHORT_VERSION}{% endif %}" \
+      com.redhat.component="{% if spec.prod == 'rhel8' or spec.prod == 'rhel9' or spec.prod == 'rhel10' or spec.prod == 'c9s' or spec.prod == 'c10s' %}${NAME}-${MYSQL_SHORT_VERSION}-container{% else %}${NAME}{% endif %}" \
+      name="{{ spec.img_name }}" \
+{% if spec.prod == 'fedora' %}      version="${MYSQL_VERSION}" \
+{% elif spec.prod != 'rhel10' %}      version="1" \
+{% endif %}{% if spec.license_terms %}      com.redhat.license_terms="{{ spec.license_terms }}" \
+{% endif %}      usage="{% if spec.prod == 'c9s' or spec.prod == 'c10s' %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}:{{ spec.prod }}{% elif spec.prod == 'fedora' %}docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}{% else %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 {{ spec.img_name }}{% endif %}" \
+      maintainer="SoftwareCollections.org <[email protected]>"
+{% endif %}


Extremely long if and the only differences I see are the use of {{spec.version}} instead of ${MYSQL_VERSION} and similar small things that evaluate to the same thing during buildtime. Maybe this can be simplified somehow?

ndavidova · 2026-06-01T10:11:19Z

Would it also make sense to include the s2i-common directories in the sources? Or just make them symlinks to the one already present in the project root

I believe this should already be present.

coderabbitai · 2026-06-09T13:46:05Z

Warning

Review limit reached

@ndavidova, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 53 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: d9436642-36bf-464b-b8cb-87fb79b92e30

📥 Commits

Reviewing files that changed from the base of the PR and between 78a998b and 0eda79b.

📒 Files selected for processing (19)

.github/workflows/container-tests.yml
8.0/Dockerfile.c9s
8.0/Dockerfile.fedora
8.0/Dockerfile.rhel8
8.0/Dockerfile.rhel9
8.0/README.md
8.0/root/usr/share/container-scripts/mysql/README.md
8.4/Dockerfile.c10s
8.4/Dockerfile.c9s
8.4/Dockerfile.fedora
8.4/Dockerfile.rhel10
8.4/Dockerfile.rhel9
8.4/README.md
8.4/root/usr/share/container-scripts/mysql/README.md
8.4/s2i-common
8.4/test
manifest.yml
specs/multispec.yml
src/Dockerfile

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch ndavidov/distgen

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

ndavidova · 2026-06-09T13:49:08Z

[test]

add distgen support

25a9aff

github-actions Bot added the pr/missing-review label May 28, 2026

add distgen-check in github workflow

195e3fa

github-actions Bot added the pr/failing-ci label May 28, 2026

ndavidova marked this pull request as ready for review May 28, 2026 15:05

ndavidova requested review from phracek and pkhartsk and removed request for pkhartsk May 29, 2026 11:28

github-actions Bot removed the pr/failing-ci label Jun 1, 2026

pkhartsk requested changes Jun 1, 2026

View reviewed changes

ndavidova force-pushed the ndavidov/distgen branch from ccf4eb6 to 4949016 Compare June 1, 2026 10:07

github-actions Bot added the pr/failing-ci label Jun 1, 2026

cleanup Dockerfile

9283c5c

ndavidova force-pushed the ndavidov/distgen branch from 4949016 to 9283c5c Compare June 1, 2026 11:59

github-actions Bot removed the pr/failing-ci label Jun 1, 2026

minimize changes to dockerfiles

0eda79b

github-actions Bot added the pr/failing-ci label Jun 16, 2026

		{% endif %}{% if spec.license_terms %} com.redhat.license_terms="{{ spec.license_terms }}" \
		{% endif %} usage="{% if spec.prod == 'c9s' or spec.prod == 'c10s' %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}:{{ spec.prod }}{% elif spec.prod == 'fedora' %}docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/{{ spec.img_name }}{% else %}podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 {{ spec.img_name }}{% endif %}" \

Conversation

ndavidova commented May 28, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ndavidova commented May 28, 2026

Uh oh!

github-actions Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request validation

Failed

Uh oh!

github-actions Bot commented May 28, 2026

Testing Farm results

Uh oh!

github-actions Bot commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing Farm results

Uh oh!

ndavidova commented May 28, 2026

Uh oh!

pkhartsk commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkhartsk left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ndavidova commented Jun 1, 2026

Uh oh!

coderabbitai Bot commented Jun 9, 2026

Review limit reached

Uh oh!

ndavidova commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ndavidova commented May 28, 2026 •

edited by github-actions Bot

Loading

github-actions Bot commented May 28, 2026 •

edited

Loading

github-actions Bot commented May 28, 2026 •

edited

Loading

pkhartsk commented Jun 1, 2026 •

edited

Loading