Merge branch '11-final'

Old 'mysqld' program name will be deprecated in favour of the newer 'mariadbd' name.

.idea/.idea.ab-mariadb-alpine.dir/.idea/GitCommitMessageStorage.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitCommitMessageStorage">
+    <option name="messageStorage">
+      <MessageStorage />
+    </option>
+  </component>
+</project>

.idea/GitCommitMessageStorage.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitCommitMessageStorage">
+    <option name="messageStorage">
+      <MessageStorage />
+    </option>
+  </component>
+</project>

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/projectSettingsUpdater.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="BodyLimit" enabled="true" level="ERROR" enabled_by_default="true" />
+      <inspection_tool class="SubjectBodySeparation" enabled="true" level="ERROR" enabled_by_default="true" />
+      <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true">
+        <option name="RIGHT_MARGIN" value="50" />
+      </inspection_tool>
+    </profile>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.run/Dockerfile.run.xml

@@ -2,20 +2,28 @@
   <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.11.5-r0" />
+        <option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:11.8.8-r0" />
         <option name="buildArgs">
           <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="ALPINE_VERSION" />
+              <option name="value" value="3.24" />
+            </DockerEnvVarImpl>
+            <DockerEnvVarImpl>
+              <option name="name" value="MARIADB_VERSION" />
+              <option name="value" value="11.8.8-r0" />
+            </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="INTERNAL_VERSION" />
-              <option name="value" value="2.2" />
+              <option name="value" value="2.3.1" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="GIT_COMMIT" />
-              <option name="value" value="a144f7ba10" />
+              <option name="value" value="64da9eea64" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="BUILD_DATE" />
-              <option name="value" value="2023-11-01" />
+              <option name="value" value="2026-09-12" />
             </DockerEnvVarImpl>
           </list>
         </option>

Dockerfile

@@ -3,8 +3,8 @@
 #
 
 # build arguments
-ARG ALPINE_VERSION="3.18"
-ARG MARIADB_VERSION="10.11.5-r0"
+ARG ALPINE_VERSION="3.24"
+ARG MARIADB_VERSION="11.8.8-r0"
 
 FROM alpine:${ALPINE_VERSION}
 ARG ALPINE_VERSION
@@ -39,8 +39,8 @@ VOLUME ["/var/lib/mysql"]
 # basic healthcheck (service only)
 HEALTHCHECK \
     --interval=30s \
-    --timeout=10s \
-    --start-period=30s \
+    --timeout=5s \
+    --start-period=5s \
     --retries=3 \
     CMD mysqladmin ping --silent
 
@@ -65,7 +65,7 @@ RUN mkdir -p /docker-entrypoint-preinit.d \
 
 # set entrypoint and default command
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
-CMD [ "/usr/bin/mysqld", "--user=mysql", "--console" ]
+CMD [ "/usr/bin/mariadbd", "--user=mysql", "--console" ]
 
 # add parameters, version and build date labels
 # set build timestamp and version labels

README.md

@@ -9,7 +9,6 @@ mariaDB.
 
 - [Quick Start](#quick-start)
   * [Pull the image](#pull-the-image)
-    + [Signed images](#signed-images)
   * [Run the image](#run-the-image)
   * [Create a database](#create-a-database)
     + [Root password](#root-password)
@@ -61,35 +60,6 @@ The examples in this document will refer to dockerhub, but know that anywhere yo
 see `asifbacchus/ab-mariadb-alpine:tag` you can use `docker.asifbacchus.app/mariadb/ab-mariadb-alpine:tag` to use my
 registry instead.
 
-#### Signed images
-
-I have abandoned using Docker's signing mechanisms in favour of [CodeNotary](https://codenotary.io). Not only are they free, they offer several big advantages including avoiding Docker's weird and over-complicated key management system. The only drawback is that verifying images requires you downloading their [client software](https://github.com/codenotary/vcn/releases) which is free to use and does not require an account for verifying images or anything else. On Linux, you can simply rename the downloaded file `vcn` and place it somewhere in your path like `/usr/local/bin`, make it executable and then you can verify this image. Here's an example, obviously you need to modify it for your environment:
-
-```sh
-# run commands as root
-sudo -s
-
-# download vcn to proper location
-wget https://github.com/vchain-us/vcn/releases/download/v0.9.9/vcn-v0.9.9-linux-amd64 -O /usr/local/bin/vcn
-chmod +x /usr/local/bin/vcn
-
-# make sure it works
-vcn --version
-
-# verify container image
-vcn authenticate docker://asifbacchus/ab-mariadb-alpine:latest
-```
-
-If you want to confirm the image is authentic before each run, you can do:
-
-```sh
-vcn verify docker://asifbacchus/ab-mariadb-alpine:latest && docker run ... docker://asifbacchus/ab-mariadb-alpine:latest
-```
-
-Since you are making verification a prerequisite to running the docker command (i.e. using `&&`), you can be sure that you are working with a verified and signed image.
-
-You can get more information on installing the client software for different platforms [here](https://docs.codenotary.io/guide/quickhelp.html#installing-the-codenotary-tools).
-
 ### Run the image
 
 The image has sensible defaults and can be run without setting many environment variables. In the example below, we will start MariaDB server and create an empty database called 'CompanyX', set a root password and create a user account for Jane Doe which has *full privileges* for the *CompanyX* database. Data will be stored in the named volume 'companyDB'.

entrypoint.sh

@@ -86,7 +86,7 @@ if [ -z "$(ls -A /var/lib/mysql/ 2> /dev/null)" ]; then
 
     # create system tables
     printf "DB-CREATE: Setting up mySQL system tables\n"
-    if (! mysql_install_db --user=mysql --ldata=/var/lib/mysql > /dev/null); then
+    if (! mariadb-install-db --user=mysql --ldata=/var/lib/mysql > /dev/null); then
         exit 1
     fi
 
@@ -113,7 +113,7 @@ if [ -z "$(ls -A /var/lib/mysql/ 2> /dev/null)" ]; then
 
     # execute statements against mariadb and cleanup
     printf "DB-CREATE: Bootstrapping mySQL database\n"
-    if (! mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$sqlCmd"); then
+    if (! mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$sqlCmd"); then
         exit 1
     fi
     shred -u "$sqlCmd"
@@ -129,7 +129,7 @@ for f in /docker-entrypoint-initdb.d/*; do
         *.sql)
             if [ -s "$f" ]; then
                 printf "IMPORT-SQL: Importing %s\n" "$f"
-                if (! mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"); then
+                if (! mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"); then
                     exit 3
                 fi
                 printf "\n"
@@ -138,7 +138,7 @@ for f in /docker-entrypoint-initdb.d/*; do
         *.sql.gz)
             if [ -s "$f" ]; then
                 printf "IMPORT-SQL: Importing %s\n" "$f"
-                if (! gunzip -c "$f" | mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0); then
+                if (! gunzip -c "$f" | mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0); then
                     exit 3
                 fi
                 printf "\n"
@@ -168,8 +168,8 @@ fi
 # process CMD sent to this container
 case "$1" in
     -*)
-        # param starts with '-' --> assume mysqld parameter(s) and append to CMD
-        set -- /usr/bin/mysqld --user=mysql --console "$@"
+        # param starts with '-' --> assume mariadbd parameter(s) and append to CMD
+        set -- /usr/bin/mariadbd --user=mysql --console "$@"
         printf "\nExecuting: %s\n" "$*"
         exec "$@"
         ;;