Skip to content

Commit

Permalink
Repair installing EPEL and avoid pip/crudini
Browse files Browse the repository at this point in the history
  • Loading branch information
dtantsur committed Aug 1, 2023
1 parent 7feee67 commit 9b81c8e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
5 changes: 2 additions & 3 deletions prepare-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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}/*
23 changes: 14 additions & 9 deletions runmariadb
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down Expand Up @@ -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" <<EOF
[mysqld]
max_connections = "${MARIADB_MAX_CONNECTIONS}"
max_heap_table_size = 1M
innodb_buffer_pool_size = 5M
innodb_log_buffer_size = 512K
user = "${USER}"
EOF

# Config MariaDB to enable TLS
if [ -f "$MARIADB_CERT_FILE" ]; then
crudini --set "$MARIADB_CONF_FILE" mariadb-10.3 ssl on
crudini --set "$MARIADB_CONF_FILE" mariadb-10.3 ssl_cert "${MARIADB_CERT_FILE}"
crudini --set "$MARIADB_CONF_FILE" mariadb-10.3 ssl_key "${MARIADB_KEY_FILE}"
cat >> "$MARIADB_CONF_FILE" <<EOF
ssl
ssl_cert = ${MARIADB_CERT_FILE}
ssl_key = ${MARIADB_KEY_FILE}
EOF
fi

mysql_install_db --datadir="$DATADIR" --skip-test-db --user="${USER}" --group="${USER}"
Expand Down

0 comments on commit 9b81c8e

Please sign in to comment.