Skip to content
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

Support mysql 8.4 on CentOS Stream 10 #376

Merged
merged 17 commits into from
Sep 19, 2024
Merged

Support mysql 8.4 on CentOS Stream 10 #376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
798aaf0
Moving sources from 8.0 -> 8.4
phracek Aug 8, 2024
9cbd9a8
Copy version 8.4 back to 8.0
phracek Aug 8, 2024
5f818c4
Add changes for version 8.4
phracek Aug 8, 2024
ecdf5e8
Update Documentation and Makefile
phracek Aug 8, 2024
c1352ad
Couple fixes caught by testing
phracek Aug 8, 2024
44b3091
Some Dockerfile fixes, so we have similar structure
phracek Aug 8, 2024
f7c7129
Use authentication_policy instead of deprecated default_authenticatio…
hhorak Aug 21, 2024
34a2ddc
Add procps-ng that is not installed in c10s by default
hhorak Aug 21, 2024
94d8049
improve doc
hhorak Aug 21, 2024
6d55b90
Use sha256_password for testing auth plugin
hhorak Aug 21, 2024
1400479
Remove calls of mysql_upgrade that is removed in 8.4 and NooP before …
hhorak Aug 22, 2024
acd003b
Fix replication and use source/replica instead of master/slave
hhorak Aug 22, 2024
777e9e3
Refactor tests to fail when something gets wrong
hhorak Aug 22, 2024
bf7ff81
Use correct versions in the Dockerfiles
hhorak Aug 22, 2024
128c62b
Do not mentioned RUN twice. Typo
phracek Sep 19, 2024
139c069
Remove obsoleted functions
phracek Sep 19, 2024
75a9379
Remove -q from grep command. We want to see an output
phracek Sep 19, 2024
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
18 changes: 10 additions & 8 deletions 8.4/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

ENV MYSQL_VERSION=8.0 \
MYSQL_SHORT_VERSION=80 \
hhorak marked this conversation as resolved.
Show resolved Hide resolved
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql
HOME=/var/lib/mysql \
NAME=mysql

ENV SUMMARY="MySQL 8.0 SQL database server" \
hhorak marked this conversation as resolved.
Show resolved Hide resolved
DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
Expand All @@ -23,14 +25,14 @@ MySQL databases on behalf of the clients."
LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="MySQL 8.0" \
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" \
name="sclorg/mysql-80-c9s" \
io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION,mysql-$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/mysql-80-c9s:c9s" \
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:c9s" \
maintainer="SoftwareCollections.org <[email protected]>"

EXPOSE 3306
Expand All @@ -39,9 +41,9 @@ EXPOSE 3306
# safe in the future. This should *never* change, the last test is there
# to make sure of that.
RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base mysql-server" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum -y clean all --enablerepo='*' && \
dnf -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)"

Expand Down
18 changes: 10 additions & 8 deletions 8.4/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ FROM ubi9/s2i-core
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account

ENV MYSQL_VERSION=8.0 \
MYSQL_SHORT_VERSION=80 \
hhorak marked this conversation as resolved.
Show resolved Hide resolved
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql
HOME=/var/lib/mysql \
NAME=mysql

ENV SUMMARY="MySQL 8.0 SQL database server" \
hhorak marked this conversation as resolved.
Show resolved Hide resolved
DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
Expand All @@ -23,14 +25,14 @@ MySQL databases on behalf of the clients."
LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="MySQL 8.0" \
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" \
name="rhel9/mysql-80" \
io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION,mysql-$MYSQL_SHORT_VERSION" \
com.redhat.component="$NAME-$MYSQL_SHORT_VERSION-container" \
name="rhel9/$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 rhel9/mysql-80" \
usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/$NAME-$MYSQL_SHORT_VERSION" \
maintainer="SoftwareCollections.org <[email protected]>"

EXPOSE 3306
Expand All @@ -39,9 +41,9 @@ EXPOSE 3306
# safe in the future. This should *never* change, the last test is there
# to make sure of that.
RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base mysql-server" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum -y clean all --enablerepo='*' && \
dnf -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)"

Expand Down