From 52a0a2223a0a5db6a8982011b3319762245c65a7 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 26 Jul 2024 12:32:41 +0200 Subject: [PATCH] Update Dockerfile.fedora Small changes in Fedora Dockerfile to match cXs Dockerfiles more. --- 10.11/Dockerfile.fedora | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/10.11/Dockerfile.fedora b/10.11/Dockerfile.fedora index de78f1d..9a7534c 100644 --- a/10.11/Dockerfile.fedora +++ b/10.11/Dockerfile.fedora @@ -24,14 +24,14 @@ MariaDB databases on behalf of the clients." LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ - io.k8s.description="MariaDB is a multi-user, multi-threaded SQL database server" \ - io.k8s.display-name="MariaDB 10.11" \ + io.k8s.description="$DESCRIPTION" \ + io.k8s.display-name="MariaDB $VERSION" \ io.openshift.expose-services="3306:mysql" \ - io.openshift.tags="database,mysql,mariadb,mariadb1011,galera" \ + io.openshift.tags="database,mysql,mariadb,mariadb1011,mariadb-1011" \ com.redhat.component="$NAME" \ name="fedora/$NAME-1011" \ version="$VERSION" \ - usage="docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/$NAME-1011" \ + usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/$NAME-1011" \ maintainer="SoftwareCollections.org " EXPOSE 3306 @@ -43,7 +43,7 @@ RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-ba dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION" && \ - dnf clean all && \ + 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)"