container/mysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 8.0 sources

Browse source
This commit is contained in:
Honza Horak 2019-01-25 16:05:34 +01:00
commit c86138dbc1
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Dockerfile
View file

@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/f28/s2i-core:latest
FROM registry.fedoraproject.org/f29/s2i-core:latest
# MySQL image for OpenShift.
#
@ -10,11 +10,11 @@ FROM registry.fedoraproject.org/f28/s2i-core:latest
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
ENV MYSQL_VERSION=5.7 \
ENV MYSQL_VERSION=8.0 \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql
ENV SUMMARY="MySQL 5.7 SQL database server" \
ENV SUMMARY="MySQL 8.0 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 \
@ -26,9 +26,9 @@ ENV NAME=mysql \
LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="MySQL 5.7" \
io.k8s.display-name="MySQL 8.0" \
io.openshift.expose-services="3306:mysql" \
io.openshift.tags="database,mysql,mysql57,rh-mysql57" \
io.openshift.tags="database,mysql,mysql80,rh-mysql80" \
com.redhat.component="$NAME" \
name="$FGC/$NAME" \
version="$VERSION" \
@ -55,9 +55,9 @@ RUN INSTALL_PKGS="rsync tar gettext hostname bind-utils groff-base shadow-utils
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr
COPY 5.7/root-common /
COPY 5.7/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 5.7/root /
COPY 8.0/root-common /
COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
COPY 8.0/root /
# this is needed due to issues with squash
# when this directory gets rm'd by the container-setup

22
root/usr/share/container-scripts/mysql/README.md
View file

@ -1,12 +1,12 @@
MySQL 5.7 SQL Database Server container image
MySQL 8.0 SQL Database Server container image
==========================================
This container image includes MySQL 5.7 SQL database server for OpenShift and general usage.
This container image includes MySQL 8.0 SQL database server for OpenShift and general usage.
Users can choose between RHEL and CentOS based images.
The RHEL image is available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhscl/mysql-57-rhel7)
as registry.access.redhat.com/rhscl/mysql-57-rhel7.
The CentOS image is then available on [Docker Hub](https://hub.docker.com/r/centos/mysql-57-centos7/)
as centos/mysql-57-centos7.
The RHEL image is available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhscl/mysql-80-rhel7)
as registry.access.redhat.com/rhscl/mysql-80-rhel7.
The CentOS image is then available on [Docker Hub](https://hub.docker.com/r/centos/mysql-80-centos7/)
as centos/mysql-80-centos7.
Description
@ -22,13 +22,13 @@ You can find more information on the MySQL project from the project Web site
Usage
-----
For this, we will assume that you are using the MySQL 5.7 container image from the
Red Hat Container Catalog called `rhscl/mysql-57-rhel7`.
For this, we will assume that you are using the MySQL 8.0 container image from the
Red Hat Container Catalog called `rhscl/mysql-80-rhel7`.
If you want to set only the mandatory environment variables and not store
the database in a host directory, execute the following command:
```
$ docker run -d --name mysql_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhscl/mysql-57-rhel7
$ docker run -d --name mysql_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhscl/mysql-80-rhel7
```
This will create a container named `mysql_database` running MySQL with database
@ -193,7 +193,7 @@ For example, to build a customized MariaDB database image `my-mysql-rhel7`
with a configuration in `~/image-configuration/` run:
```
$ s2i build ~/image-configuration/ rhscl/mysql-57-rhel7 my-mysql-rhel7
$ s2i build ~/image-configuration/ rhscl/mysql-80-rhel7 my-mysql-rhel7
```
The directory passed to `s2i build` can contain these directories:
@ -267,7 +267,7 @@ MySQL and MariaDB use versions that consist of three numbers X.Y.Z (e.g. 5.6.23)
For version changes in Z part, the server's binary data format stays compatible and thus no
special upgrade procedure is needed. For upgrades from X.Y to X.Y+1, consider doing manual
steps as described at
https://dev.mysql.com/doc/refman/5.7/en/upgrading-from-previous-series.html.
https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html.
Skipping versions like from X.Y to X.Y+2 or downgrading to lower version is not supported;
the only exception is ugrading from MariaDB 5.5 to MariaDB 10.0.