From 35fd4d2afdaaa8ce0b9b350f09bf6b8eb1ec0a4b Mon Sep 17 00:00:00 2001
From: Steve Salas <salas@blackduck.com>
Date: Wed, 25 Mar 2026 13:51:10 -0400
Subject: [PATCH 1/2] feat: Upgrade to non-Bitnami MariaDB

---
 docker-compose.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 53f0179..8deee3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,16 +15,29 @@
 #   For details on configuring an Software Risk Manager, refer to this URL:
 #   https://github.com/codedx/srm-docker/blob/master/docs/DeploymentGuide.md#installation
 #
-version: '2'
 services:
+    codedx-db-init:
+        image: busybox
+        user: "0:0"
+        command: ["sh", "-c", "chown -R 1001:1001 /mariadb"]
+        volumes:
+            - codedx-database-volume:/mariadb
     codedx-db:
-        image: codedx/codedx-mariadb:v1.38.0
+        image: codedx/codedx-mariadb:v1.41.0
+        command:
+            - --optimizer_search_depth=0
+            - --character-set-server=utf8mb4
+            - --collation-server=utf8mb4_general_ci
+            - --lower_case_table_names=1
+            - --datadir=/mariadb/data
         environment:
             MARIADB_ROOT_PASSWORD: "root"
             MARIADB_DATABASE: "codedx" # a password with a single quote is unsupported
-            MARIADB_EXTRA_FLAGS: "--optimizer_search_depth=0 --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --lower_case_table_names=1"
         volumes:
-            - codedx-database-volume:/bitnami/mariadb
+            - codedx-database-volume:/mariadb
+        depends_on:
+            codedx-db-init:
+                condition: service_completed_successfully
     codedx-tomcat:
         image: codedx/codedx-tomcat:v2026.3.1
         environment:

From c215530fa62027670152fbb1d51af09854c9dc61 Mon Sep 17 00:00:00 2001
From: Steve Salas <salas@blackduck.com>
Date: Wed, 25 Mar 2026 16:04:08 -0400
Subject: [PATCH 2/2] chore: Unpin MariaDB v1.38.0

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index febb348..0b30010 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -130,7 +130,7 @@ pipeline {
 									}
 
 									codeDxVersion             = currentVersions[0]
-									mariaDBVersion            = 'v1.38.0' // currentVersions[1]
+									mariaDBVersion            = currentVersions[1]
 
 									def isCurrentVersion = sh(returnStdout: true, script: "pwsh -command \"&{ . ./.version/common.ps1; Test-CodeDxVersion './docker-compose.yml' '$codeDxVersion' '$mariaDBVersion' }\"")