-
Notifications
You must be signed in to change notification settings - Fork 69
Add mariadb 11.8 #288
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
Merged
Merged
Add mariadb 11.8 #288
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ad14711
Move 10.11 -> 11.8 to keep history
ndavidova 201d763
Add 10.11 (copy of 11.8)
ndavidova 9b54b6c
Remove c8s, rhel8 Dockerfiles, exclude files
ndavidova 3673c1e
Update 11.8 Dockerfiles
ndavidova 1311a17
Add exclude files
ndavidova 56a4535
Add 11.8 to Makefile
ndavidova 242a134
Update build-and-push.yml to include 11.8
ndavidova e56a360
Include mariadb 11.8 in checks
ndavidova 6bc39db
Increase innodb buffer pool size
ndavidova f3fc8b1
Add --disable-ssl-verify-server-cert for MariaDB >=11.4
ndavidova File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
Empty file.
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| FROM quay.io/sclorg/s2i-core-c10s:c10s | ||
|
|
||
| # MariaDB image for OpenShift. | ||
| # | ||
| # Volumes: | ||
| # * /var/lib/mysql/data - Datastore for MariaDB | ||
| # Environment: | ||
| # * $MYSQL_USER - Database user name | ||
| # * $MYSQL_PASSWORD - User's password | ||
| # * $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=11.8 \ | ||
| MYSQL_SHORT_VERSION=118 | ||
|
|
||
| ENV VERSION="${MYSQL_VERSION}" \ | ||
| APP_DATA=/opt/app-root/src \ | ||
| HOME=/var/lib/mysql \ | ||
| NAME=mariadb \ | ||
| ARCH=x86_64 \ | ||
| SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \ | ||
| DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \ | ||
| image provides a containerized packaging of the MariaDB mysqld daemon and client application. \ | ||
| The mysqld server daemon accepts connections from clients and provides access to content from \ | ||
| MariaDB databases on behalf of the clients." | ||
|
|
||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \ | ||
| io.openshift.expose-services="3306:mysql" \ | ||
| io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \ | ||
| name="sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c10s" \ | ||
| version="1" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ | ||
| usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c10s" \ | ||
| maintainer="SoftwareCollections.org <sclorg@redhat.com>" | ||
|
|
||
| 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. | ||
| RUN INSTALL_PKGS="policycoreutils rsync tar xz gettext hostname bind-utils groff-base" && \ | ||
| dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} ${NAME}${MYSQL_VERSION}-server && \ | ||
| /usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}" && \ | ||
| dnf -y clean all --enablerepo='*' && \ | ||
| mkdir -p ${HOME}/data && chown -R mysql:root ${HOME} && \ | ||
| test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)" | ||
|
|
||
| # Get prefix path and path to scripts rather than hard-code them in scripts | ||
| 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 / | ||
|
|
||
| # 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 /usr/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 | ||
| # script. | ||
| # Also reset permissions of filesystem to default values | ||
| RUN rm -rf /etc/my.cnf.d/* && \ | ||
| /usr/libexec/container-setup && \ | ||
| rpm-file-permissions | ||
|
|
||
| USER 27 | ||
|
|
||
| ENTRYPOINT ["container-entrypoint"] | ||
| CMD ["run-mysqld"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| FROM quay.io/sclorg/s2i-core-c9s:c9s | ||
|
|
||
| # MariaDB image for OpenShift. | ||
| # | ||
| # Volumes: | ||
| # * /var/lib/mysql/data - Datastore for MariaDB | ||
| # Environment: | ||
| # * $MYSQL_USER - Database user name | ||
| # * $MYSQL_PASSWORD - User's password | ||
| # * $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=11.8 \ | ||
| MYSQL_SHORT_VERSION=118 | ||
|
|
||
| ENV VERSION="${MYSQL_VERSION}" \ | ||
| APP_DATA=/opt/app-root/src \ | ||
| HOME=/var/lib/mysql \ | ||
| NAME=mariadb \ | ||
| SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \ | ||
| DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \ | ||
| image provides a containerized packaging of the MariaDB mysqld daemon and client application. \ | ||
| The mysqld server daemon accepts connections from clients and provides access to content from \ | ||
| MariaDB databases on behalf of the clients." | ||
|
|
||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \ | ||
| io.openshift.expose-services="3306:mysql" \ | ||
| io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \ | ||
| name="sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c9s" \ | ||
| version="1" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ | ||
| usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c9s" \ | ||
| maintainer="SoftwareCollections.org <sclorg@redhat.com>" | ||
|
|
||
| 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. | ||
| RUN yum -y module enable ${NAME}:${MYSQL_VERSION} && \ | ||
| INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base ${NAME}-server" && \ | ||
| yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ | ||
| rpm -V ${INSTALL_PKGS} && \ | ||
| /usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}" && \ | ||
| yum -y clean all --enablerepo='*' && \ | ||
| mkdir -p ${HOME}/data && chown -R mysql:root ${HOME} && \ | ||
| test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)" | ||
|
|
||
| # Get prefix path and path to scripts rather than hard-code them in scripts | ||
| 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 / | ||
|
|
||
| # 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 /usr/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 | ||
| # script. | ||
| # Also reset permissions of filesystem to default values | ||
| RUN rm -rf /etc/my.cnf.d/* && \ | ||
| /usr/libexec/container-setup && \ | ||
| rpm-file-permissions | ||
|
|
||
| USER 27 | ||
|
|
||
| ENTRYPOINT ["container-entrypoint"] | ||
| CMD ["run-mysqld"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| FROM quay.io/fedora/s2i-core:42 | ||
|
|
||
| # MariaDB image for OpenShift. | ||
| # | ||
| # Volumes: | ||
| # * /var/lib/mysql/data - Datastore for MariaDB | ||
| # Environment: | ||
| # * $MYSQL_USER - Database user name | ||
| # * $MYSQL_PASSWORD - User's password | ||
| # * $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=11.8 \ | ||
| MYSQL_SHORT_VERSION=118 | ||
|
|
||
| ENV VERSION="${MYSQL_VERSION}" \ | ||
| APP_DATA=/opt/app-root/src \ | ||
| HOME=/var/lib/mysql \ | ||
| NAME=mariadb \ | ||
| ARCH=x86_64 \ | ||
| SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \ | ||
| DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \ | ||
| image provides a containerized packaging of the MariaDB mysqld daemon and client application. \ | ||
| The mysqld server daemon accepts connections from clients and provides access to content from \ | ||
| MariaDB databases on behalf of the clients." | ||
|
|
||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \ | ||
| io.openshift.expose-services="3306:mysql" \ | ||
| io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| com.redhat.component="${NAME}" \ | ||
| name="fedora/${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| version="${MYSQL_VERSION}" \ | ||
| usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| maintainer="SoftwareCollections.org <sclorg@redhat.com>" | ||
|
|
||
| EXPOSE 3306 | ||
|
|
||
| # 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 /usr/sbin/groupadd -g 27 -o -r mysql && \ | ||
| /usr/sbin/useradd -M -N -g mysql -o -r -d ${HOME} -s /sbin/nologin -c "MySQL Server" -u 27 mysql && \ | ||
| test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)" && \ | ||
| INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base" && \ | ||
| dnf install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} ${NAME}${MYSQL_VERSION}-server && \ | ||
| /usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}" && \ | ||
| dnf -y clean all --enablerepo='*' && \ | ||
| mkdir -p ${HOME}/data && chown -R mysql:root ${HOME} && \ | ||
| test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)" | ||
|
|
||
| # Get prefix path and path to scripts rather than hard-code them in scripts | ||
| 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 / | ||
|
|
||
| # 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 /usr/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 | ||
| # script. | ||
| # Also reset permissions of filesystem to default values | ||
| RUN rm -rf /etc/my.cnf.d/* && \ | ||
| /usr/libexec/container-setup && \ | ||
| rpm-file-permissions | ||
|
|
||
| USER 27 | ||
|
|
||
| ENTRYPOINT ["container-entrypoint"] | ||
| CMD ["run-mysqld"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| FROM ubi10/s2i-core | ||
|
|
||
| # MariaDB image for OpenShift. | ||
| # | ||
| # Volumes: | ||
| # * /var/lib/mysql/data - Datastore for MariaDB | ||
| # Environment: | ||
| # * $MYSQL_USER - Database user name | ||
| # * $MYSQL_PASSWORD - User's password | ||
| # * $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=11.8 \ | ||
| MYSQL_SHORT_VERSION=118 | ||
|
|
||
| ENV VERSION="${MYSQL_VERSION}" \ | ||
| APP_DATA=/opt/app-root/src \ | ||
| HOME=/var/lib/mysql \ | ||
| NAME=mariadb \ | ||
| SUMMARY="MariaDB ${MYSQL_VERSION} SQL database server" \ | ||
| DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \ | ||
| image provides a containerized packaging of the MariaDB mysqld daemon and client application. \ | ||
| The mysqld server daemon accepts connections from clients and provides access to content from \ | ||
| MariaDB databases on behalf of the clients." | ||
|
|
||
| LABEL summary="${SUMMARY}" \ | ||
| description="${DESCRIPTION}" \ | ||
| io.k8s.description="${DESCRIPTION}" \ | ||
| io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \ | ||
| io.openshift.expose-services="3306:mysql" \ | ||
| io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \ | ||
| name="rhel10/${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| version="1" \ | ||
| com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ | ||
| usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel10/${NAME}-${MYSQL_SHORT_VERSION}" \ | ||
| maintainer="SoftwareCollections.org <sclorg@redhat.com>" | ||
|
|
||
| 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. | ||
| RUN INSTALL_PKGS="policycoreutils rsync tar xz gettext hostname bind-utils groff-base" && \ | ||
| dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} ${NAME}${MYSQL_VERSION}-server && \ | ||
| /usr/libexec/mysqld -V | grep -qe "${MYSQL_VERSION}\." && echo "Found VERSION ${MYSQL_VERSION}" && \ | ||
| dnf -y clean all --enablerepo='*' && \ | ||
| mkdir -p ${HOME}/data && chown -R mysql:root ${HOME} && \ | ||
| test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)" | ||
|
|
||
| # Get prefix path and path to scripts rather than hard-code them in scripts | ||
| 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 / | ||
|
|
||
| # 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 /usr/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 | ||
| # script. | ||
| # Also reset permissions of filesystem to default values | ||
| RUN rm -rf /etc/my.cnf.d/* && \ | ||
| /usr/libexec/container-setup && \ | ||
| rpm-file-permissions | ||
|
|
||
| USER 27 | ||
|
|
||
| ENTRYPOINT ["container-entrypoint"] | ||
| CMD ["run-mysqld"] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.