diff --git a/prepare-image.sh b/prepare-image.sh index e4cb76e1..f1db011b 100755 --- a/prepare-image.sh +++ b/prepare-image.sh @@ -6,7 +6,8 @@ echo "install_weak_deps=False" >> /etc/dnf/dnf.conf # Tell RPM to skip installing documentation echo "tsflags=nodocs" >> /etc/dnf/dnf.conf -dnf install -y epel-release 'dnf-command(config-manager)' python3-pip +dnf install -y 'dnf-command(config-manager)' \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm dnf config-manager --set-disabled epel xargs -rtd'\n' dnf install -y < /tmp/"${PKGS_LIST}" @@ -19,7 +20,5 @@ fi dnf install -y --enablerepo=epel inotify-tools -python3 -m pip install crudini - dnf clean all rm -rf /var/cache/{yum,dnf}/* diff --git a/runmariadb b/runmariadb index 8acfa6c3..666767bd 100755 --- a/runmariadb +++ b/runmariadb @@ -5,7 +5,7 @@ set -eux PATH=$PATH:/usr/sbin/ DATADIR="/var/lib/mysql" MARIADB_PASSWORD=${MARIADB_PASSWORD:-"change_me"} -MARIADB_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf" +MARIADB_CONF_FILE="/etc/my.cnf.d/metal3.cnf" MARIADB_CERT_FILE=/certs/mariadb/tls.crt MARIADB_KEY_FILE=/certs/mariadb/tls.key RESTART_CONTAINER_CERTIFICATE_UPDATED=${RESTART_CONTAINER_CERTIFICATE_UPDATED:-"false"} @@ -33,17 +33,22 @@ if [[ -f "$MARIADB_CERT_FILE" && "${RESTART_CONTAINER_CERTIFICATE_UPDATED}" == " fi if [ ! -d "${DATADIR}/mysql" ]; then - crudini --set "$MARIADB_CONF_FILE" mysqld max_connections "${MARIADB_MAX_CONNECTIONS}" - crudini --set "$MARIADB_CONF_FILE" mysqld max_heap_table_size 1M - crudini --set "$MARIADB_CONF_FILE" mysqld innodb_buffer_pool_size 5M - crudini --set "$MARIADB_CONF_FILE" mysqld innodb_log_buffer_size 512K - crudini --set "$MARIADB_CONF_FILE" mysqld user "${USER}" + cat > "$MARIADB_CONF_FILE" <> "$MARIADB_CONF_FILE" <