diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 7b670c2b..6b534651 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -23,5 +23,7 @@ RUN --mount=type=cache,id=mariadb-apk-${TARGETARCH},sharing=locked,target=/var/c # base image. Set to 10 minutes just incase it ran on very old or overallocated # hardware. ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=600000 +# Default Mariadb value of 16 MB (bytes) +ENV MYSQL_MAX_ALLOWED_PACKET=16777216 COPY --link rootfs / diff --git a/mariadb/README.md b/mariadb/README.md index 1937280e..a659a605 100644 --- a/mariadb/README.md +++ b/mariadb/README.md @@ -41,6 +41,7 @@ default database connection configuration. | :------------------- | :------ | :------------------------------------------------------------------------------------ | | MYSQL_ROOT_PASSWORD | | The database root user password. Defaults to `DB_ROOT_PASSWORD` | | MYSQL_ROOT_USER | | The database root user (used to create the site database). Defaults to `DB_ROOT_USER` | +| MYSQL_MAX_ALLOWED_PACKET | 16777216 | Max packet length to send to or receive from the server, [documentation](https://mariadb.com/docs/server/ref/mdb/system-variables/max_allowed_packet/) | ## Logs diff --git a/mariadb/rootfs/etc/confd/conf.d/mariadb-server.cnf.toml b/mariadb/rootfs/etc/confd/conf.d/mariadb-server.cnf.toml new file mode 100644 index 00000000..cd0d3a6a --- /dev/null +++ b/mariadb/rootfs/etc/confd/conf.d/mariadb-server.cnf.toml @@ -0,0 +1,7 @@ +[template] +src = "mariadb-server.cnf.tmpl" +dest = "/etc/my.cnf.d/mariadb-server.cnf" +uid = 0 +gid = 0 +mode = "0664" +keys = [ "/" ] diff --git a/mariadb/rootfs/etc/my.cnf.d/mariadb-server.cnf b/mariadb/rootfs/etc/confd/templates/mariadb-server.cnf.tmpl similarity index 94% rename from mariadb/rootfs/etc/my.cnf.d/mariadb-server.cnf rename to mariadb/rootfs/etc/confd/templates/mariadb-server.cnf.tmpl index 77569381..75b10f93 100644 --- a/mariadb/rootfs/etc/my.cnf.d/mariadb-server.cnf +++ b/mariadb/rootfs/etc/confd/templates/mariadb-server.cnf.tmpl @@ -8,7 +8,7 @@ # this is only for the mysqld standalone daemon [mysqld] # skip-networking - +max_allowed_packet ={{ getenv "MYSQL_MAX_ALLOWED_PACKET" }} # Galera-related settings [galera] # Mandatory settings