Skip to content

add distgen support #437

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.

Sign up for GitHub

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

Open
ndavidova wants to merge 4 commits into
base: master
Choose a base branch
from
Open

add distgen support #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25a9aff
add distgen support
ndavidova May 28, 2026
195e3fa
add distgen-check in github workflow
ndavidova May 28, 2026
9283c5c
cleanup Dockerfile
ndavidova Jun 1, 2026
0eda79b
minimize changes to dockerfiles
ndavidova Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/container-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
types:
- created
jobs:
distgen-check:
uses: "sclorg/ci-actions/.github/workflows/distgen-check.yml@main"
check-readme:
uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
container-tests:
Expand Down
11 changes: 5 additions & 6 deletions 8.0/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ LABEL summary="${SUMMARY}" \

EXPOSE 3306

# 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.
# 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
RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname groff-base ${NAME}-server" && \
yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
rpm -V ${INSTALL_PKGS} && \
Expand All @@ -52,9 +51,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname groff-base ${NAME}-
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr

COPY ${MYSQL_VERSION}/root-common /
COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY ${MYSQL_VERSION}/root /
COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY 8.0/root /

# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on error
Expand Down
6 changes: 3 additions & 3 deletions 8.0/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ RUN /usr/sbin/groupadd -g 27 -o -r mysql && \
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr

COPY ${MYSQL_VERSION}/root-common /
COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY ${MYSQL_VERSION}/root /
COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY 8.0/root /

# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on error
Expand Down
32 changes: 17 additions & 15 deletions 8.0/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,26 @@ FROM ubi8/s2i-core
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

# Standalone ENV call so these values can be re-used in the other ENV calls
ENV MYSQL_VERSION=8.0 \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql
MYSQL_SHORT_VERSION=80

ENV SUMMARY="MySQL 8.0 SQL database server" \
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 8.0" \
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,mysql,mysql80,mysql-80" \
com.redhat.component="mysql-80-container" \
io.openshift.tags="database,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
name="rhel8/mysql-80" \
version="1" \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
Expand All @@ -35,9 +38,8 @@ LABEL summary="$SUMMARY" \

EXPOSE 3306

# 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.
# 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
RUN yum -y module enable mysql:$MYSQL_VERSION && \
INSTALL_PKGS="policycoreutils rsync tar gettext hostname groff-base mysql-server" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand All @@ -51,13 +53,13 @@ ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr

COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY 8.0/root /

# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on error
# /usr/libexec/s2i/run no such file or directory
RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
RUN ln -s /bin/run-mysqld ${STI_SCRIPTS_PATH}/run

# this is needed due to issues with squash
# when this directory gets rm'd by the container-setup
Expand All @@ -66,7 +68,7 @@ RUN ln -s /bin/run-mysqld $STI_SCRIPTS_PATH/run
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"
/usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}"

USER 27

Expand Down
11 changes: 5 additions & 6 deletions 8.0/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ LABEL summary="${SUMMARY}" \

EXPOSE 3306

# 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.
# 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
RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind9.18-utils groff-base ${NAME}-server" && \
yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
rpm -V ${INSTALL_PKGS} && \
Expand All @@ -52,9 +51,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind9.18-utils grof
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr

COPY ${MYSQL_VERSION}/root-common /
COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY ${MYSQL_VERSION}/root /
COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ ${STI_SCRIPTS_PATH}
COPY 8.0/root /

# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on error
Expand Down
1 change: 0 additions & 1 deletion 8.0/README.md
View file
Open in desktop

This file was deleted.

Loading