Merge pull request #159 from linuxserver/3.21

Author: Roxedus

.github/workflows/external_trigger.yml

@@ -23,7 +23,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`mariadb_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
@@ -96,7 +96,7 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"mariadb"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
             echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
             FAILURE_REASON="New version ${EXT_RELEASE} for mariadb tag latest is detected, however not all arch repos are updated yet. Will try again later."
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 # set version label
 ARG BUILD_DATE
@@ -11,12 +11,12 @@ LABEL maintainer="thelamer,nemchik"
 
 # environment variables
 ENV MYSQL_DIR="/config"
-ENV DATADIR=$MYSQL_DIR/databases
+ENV DATADIR="$MYSQL_DIR/databases"
 
 RUN \
   echo "**** install runtime packages ****" && \
   if [ -z ${MARIADB_VERSION+x} ]; then \
-    MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
@@ -26,8 +26,6 @@ RUN \
     mariadb-client==${MARIADB_VERSION} \
     mariadb-common==${MARIADB_VERSION} \
     mariadb-server-utils==${MARIADB_VERSION} && \
-  mkdir -p \
-    /var/lib/mysql && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 # set version label
 ARG BUILD_DATE
@@ -11,12 +11,12 @@ LABEL maintainer="thelamer,nemchik"
 
 # environment variables
 ENV MYSQL_DIR="/config"
-ENV DATADIR=$MYSQL_DIR/databases
+ENV DATADIR="$MYSQL_DIR/databases"
 
 RUN \
   echo "**** install runtime packages ****" && \
   if [ -z ${MARIADB_VERSION+x} ]; then \
-    MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    MARIADB_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:mariadb$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
@@ -26,8 +26,6 @@ RUN \
     mariadb-client==${MARIADB_VERSION} \
     mariadb-common==${MARIADB_VERSION} \
     mariadb-server-utils==${MARIADB_VERSION} && \
-  mkdir -p \
-    /var/lib/mysql && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \

Jenkinsfile

@@ -27,8 +27,7 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/mariadb'
     PR_DOCKERHUB_IMAGE = 'lspipepr/mariadb'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.20'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/main/'
     DIST_REPO_PACKAGES = 'mariadb'
     MULTIARCH='true'
     CI='true'

README.md

@@ -122,6 +122,19 @@ When this container initializes, if `MYSQL_ROOT_PASSWORD` is set an upgrade chec
 mariadb-upgrade -u root -p<PASSWORD>
 ```
 
+## Read-Only Operation
+
+This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
+
+### Caveats
+
+* `/tmp` must be mounted to tmpfs
+* Not supported on first run
+
+## Non-Root Operation
+
+This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
+
 ## Usage
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -188,6 +201,8 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e MYSQL_PASSWORD=DATABASE_PASSWORD` | Set this to the password you want to use for you MYSQL_USER (minimum 4 characters & non-alphanumeric passwords must be properly escaped). (valid only for first run) |
 | `-e REMOTE_SQL=http://URL1/your.sql,https://URL2/your.sql` | Set this to ingest sql files from an http/https endpoint (comma seperated array). |
 | `-v /config` | Persistent config files |
+| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
+| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -351,6 +366,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.01.25:** - Rebase to Alpine 3.21.
 * **31.05.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **09.06.23:** - Update lc_messages path in shipped custom.cnf to match upstream.

jenkins-vars.yml

@@ -15,8 +15,7 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/mariadb'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/mariadb'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.20'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/main/'
   - DIST_REPO_PACKAGES = 'mariadb'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -6,7 +6,6 @@ project_url: "https://mariadb.org/"
 project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mariadb-git.png"
 project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is one of the most popular database servers. Made by the original developers of MySQL."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_blurb_optional_extras_enabled: false
 # supported architectures
 available_architectures:
   - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -30,6 +29,11 @@ opt_param_env_vars:
   - {env_var: "MYSQL_USER", env_value: "MYSQL_USER", desc: "This user will have superuser access to the database specified by MYSQL_DATABASE (do not use root here). (valid only for first run)"}
   - {env_var: "MYSQL_PASSWORD", env_value: "DATABASE_PASSWORD", desc: "Set this to the password you want to use for you MYSQL_USER (minimum 4 characters & non-alphanumeric passwords must be properly escaped). (valid only for first run)"}
   - {env_var: "REMOTE_SQL", env_value: "http://URL1/your.sql,https://URL2/your.sql", desc: "Set this to ingest sql files from an http/https endpoint (comma seperated array)."}
+readonly_supported: true
+readonly_message: |
+  * `/tmp` must be mounted to tmpfs
+  * Not supported on first run
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -142,6 +146,7 @@ init_diagram: |
   "mariadb:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.01.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "31.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - {date: "09.06.23:", desc: "Update lc_messages path in shipped custom.cnf to match upstream."}

root/defaults/custom.cnf

@@ -15,7 +15,7 @@
 # especially if they contain "#" chars...
 [client]
 port            = 3306
-socket          = /var/run/mysqld/mysqld.sock
+socket          = /run/mysqld/mysqld.sock
 
 default-character-set = utf8mb4
 
@@ -24,16 +24,16 @@ default-character-set = utf8mb4
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket          = /var/run/mysqld/mysqld.sock
+socket          = /run/mysqld/mysqld.sock
 nice            = 0
 
 [mysqld]
 #
 # * Basic Settings
 #
 user            = abc
-pid-file        = /var/run/mysqld/mysqld.pid
-socket          = /var/run/mysqld/mysqld.sock
+pid-file        = /run/mysqld/mysqld.pid
+socket          = /run/mysqld/mysqld.sock
 port            = 3306
 basedir         = /usr
 datadir         = /var/lib/mysql

root/etc/s6-overlay/s6-rc.d/init-mariadb-config/run

@@ -5,16 +5,14 @@
 mkdir -p \
     "${DATADIR}" \
     /config/log/mysql \
-    /var/run/mysqld
+    /run/mysqld
 
-# configure mariadb-server.cnf
-sed -i "s|.*skip-networking.*|#skip-networking|g" /etc/my.cnf.d/mariadb-server.cnf
+# copy custom cnf file
+if [[ ! -f /config/custom.cnf ]]; then
+    cp /defaults/custom.cnf /config/custom.cnf
+fi
 
-# setup custom cnf file
-cp -n /defaults/custom.cnf /config/custom.cnf
-rm -rf /etc/my.cnf.d/custom.cnf
-ln -s /config/custom.cnf /etc/my.cnf.d/custom.cnf
-
-# set permissions
-chmod -R 777 \
-    /var/run/mysqld
+# remove orphan pid file
+if [[ -f /run/mysqld/mysqld.pid ]]; then
+    rm -f /run/mysqld/mysqld.pid
+fi

root/etc/s6-overlay/s6-rc.d/init-mariadb-initdb/run

@@ -3,7 +3,11 @@
 
 # set start function used later
 start_mariadb() {
-    mariadbd --datadir="${DATADIR}" --init-file="${tempSqlFile}" --user=abc &
+    if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+        mariadbd --datadir="${DATADIR}" --init-file="${tempSqlFile}" --pid-file=/run/mysqld/mysqld.pid --user=abc &
+    else
+        mariadbd --datadir="${DATADIR}" --init-file="${tempSqlFile}" --pid-file=/run/mysqld/mysqld.pid &
+    fi
     pid="$!"
     RET=1
     while [[ ${RET} -ne 0 ]]; do
@@ -74,13 +78,17 @@ EONEWSQL
         done
     fi
 
-    # set some permissions needed before we begin
-    lsiown -R abc:abc "${tempSqlFile}" /config/log/mysql /var/run/mysqld /var/lib/mysql
-    chmod -R 777 /config/log/mysql /var/run/mysqld /var/lib/mysql
+    if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+        lsiown -R abc:abc "${tempSqlFile}" /config/log/mysql /run/mysqld
+        chmod -R 777 /config/log/mysql /run/mysqld
+    fi
 
     # initialise database structure
-    mariadb-install-db --datadir="${DATADIR}" --user=abc --auth-root-authentication-method=normal
-
+    if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+        mariadb-install-db --datadir="${DATADIR}" --user=abc --auth-root-authentication-method=normal
+    else
+        mariadb-install-db --datadir="${DATADIR}" --auth-root-authentication-method=normal
+    fi
     # start mariadb and apply our sql commands we set above
     start_mariadb
 
@@ -113,6 +121,8 @@ EOFPASS
     rm -f "${tempSqlFile}"
 fi
 
-# own the folder the pid for mysql runs in
-lsiown -R abc:abc /var/run/mysqld
-lsiown -R abc:abc /config
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    # own the folder the pid for mysql runs in
+    lsiown -R abc:abc /run/mysqld
+    lsiown -R abc:abc /config
+fi