Draft 2 - max_packet_now has default env but still NOT dynamic. Confd…

… env values ignored
Islandora-Devops · Oct 30, 2023 · 672b564 · 672b564
1 parent 3fdce2d
commit 672b564
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git 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 value of 256 MB in bytes
+ENV DB_MAX_ALLOWED_PACKET=268435456
 
 COPY --link rootfs /
diff --git a/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/dependencies.d/ready b/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/dependencies.d/ready
diff --git a/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/type b/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/type
@@ -0,0 +1 @@
+oneshot
diff --git a/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/up b/mariadb/rootfs/etc/s6-overlay/s6-rc.d/set-max-packet/up
@@ -0,0 +1 @@
+/etc/s6-overlay/scripts/set-max-packet.sh
diff --git a/mariadb/rootfs/etc/s6-overlay/scripts/set-max-packet.sh b/mariadb/rootfs/etc/s6-overlay/scripts/set-max-packet.sh
@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 set -e
 
-# Use what has been provided by the user or default to the derived values.
+# Use what has been provided by the user or default value of 256M
 cat <<EOF | /usr/local/bin/confd-import-environment.sh
     DB_MAX_ALLOWED_PACKET={{ getenv "DB_MAX_ALLOWED_PACKET" "${DB_MAX_ALLOWED_PACKET}" }}
 EOF