Pull changes from upstream and rebase for: rebuild for latest ubi8:8.2-ondeck
created from upstream commit: 0ad545c7e1e8b4eccf5753b24f11f84a23ac1f90 Related: RHELPLAN-17567
This commit is contained in:
Petr Kubat
Honza Horak
parent
08351a2e89
commit
172992f95a
3 changed files with 11 additions and 10 deletions
|
|
@ -29,6 +29,7 @@ LABEL summary="$SUMMARY" \
|
|||
com.redhat.component="mysql-80-container" \
|
||||
name="rhel8/mysql-80" \
|
||||
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 rhel8/mysql-80" \
|
||||
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
|
||||
|
||||
|
|
@ -39,9 +40,9 @@ EXPOSE 3306
|
|||
# to make sure of that.
|
||||
RUN yum -y module enable mysql:$MYSQL_VERSION && \
|
||||
INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base mysql-server" && \
|
||||
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS shadow-utils && \
|
||||
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
|
||||
rpm -V $INSTALL_PKGS && \
|
||||
yum clean all && \
|
||||
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)"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"name": "mysql-ephemeral",
|
||||
"annotations": {
|
||||
"openshift.io/display-name": "MySQL (Ephemeral)",
|
||||
"description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
|
||||
"description": "MySQL database service, without persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/8.0/root/usr/share/container-scripts/mysql/README.md.\n\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
|
||||
"iconClass": "icon-mysql-database",
|
||||
"tags": "database,mysql",
|
||||
"openshift.io/long-description": "This template provides a standalone MySQL server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.",
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"openshift.io/support-url": "https://access.redhat.com"
|
||||
}
|
||||
},
|
||||
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/root/usr/share/container-scripts/mysql/README.md.",
|
||||
"message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n Username: ${MYSQL_USER}\n Password: ${MYSQL_PASSWORD}\n Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/8.0/root/usr/share/container-scripts/mysql/README.md.",
|
||||
"labels": {
|
||||
"template": "mysql-ephemeral-template"
|
||||
},
|
||||
|
|
@ -265,8 +265,8 @@
|
|||
{
|
||||
"name": "MYSQL_VERSION",
|
||||
"displayName": "Version of MySQL Image",
|
||||
"description": "Version of MySQL image to be used (5.7, or latest).",
|
||||
"value": "5.7",
|
||||
"description": "Version of MySQL image to be used (8.0, or latest).",
|
||||
"value": "8.0",
|
||||
"required": true
|
||||
}
|
||||
]
|
||||
|
|
|
|||
8
test/run
8
test/run
|
|
@ -273,7 +273,7 @@ function test_config_option() {
|
|||
local option_value="$4"
|
||||
|
||||
if ! echo "$configuration" | grep -qx "$option_name[[:space:]]*=[[:space:]]*$option_value"; then
|
||||
local configs="$(docker exec -t "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; echo /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/* | paste -s')"
|
||||
local configs="$(docker exec "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; echo /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/* | paste -s')"
|
||||
echo >&2 "FAIL: option '$option_name' should have value '$option_value', but it wasn't found in any of the configuration files ($configs):"
|
||||
echo >&2
|
||||
echo >&2 "$configuration"
|
||||
|
|
@ -316,7 +316,7 @@ function run_configuration_tests() {
|
|||
# - we should look for an option in the desired config, not in all of them
|
||||
# - we should respect section of the config (now we have duplicated options from a different sections)
|
||||
local configuration
|
||||
configuration="$(docker exec -t "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
configuration="$(docker exec "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
|
||||
test_config_option "$container_name" "$configuration" lower_case_table_names 1
|
||||
test_config_option "$container_name" "$configuration" general_log 1
|
||||
|
|
@ -347,7 +347,7 @@ function run_configuration_tests() {
|
|||
|
||||
test_connection "$container_name" config_test_user config_test
|
||||
|
||||
configuration="$(docker exec -t "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
configuration="$(docker exec "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
|
||||
test_config_option "$container_name" "$configuration" key_buffer_size 51M
|
||||
test_config_option "$container_name" "$configuration" read_buffer_size 25M
|
||||
|
|
@ -411,7 +411,7 @@ _s2i_test_image() {
|
|||
|
||||
test_connection "$container_name" operations_user operations_pass
|
||||
|
||||
configuration="$(docker exec -t "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
configuration="$(docker exec "$(ct_get_cid $container_name)" bash -c 'set +f; shopt -s nullglob; egrep -hv "^(#|\!|\[|$)" /etc/my.cnf /etc/my.cnf.d/* /opt/rh/mysql*/root/etc/my.cnf /opt/rh/mysql*/root/etc/my.cnf.d/*' | sed 's,\(^[[:space:]]\+\|[[:space:]]\+$\),,' | sort -u)"
|
||||
|
||||
docker stop "$(ct_get_cid $container_name)" >/dev/null
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue