Push changes for 11.7

databases/mariadb/mariadb-11.7/entrypoint.sh

@@ -87,14 +87,14 @@ generate_caddyfile
 # fi
 
 
-if [ ! -d "$MARIADB_DATADIR/mysql" ]; then
-  echo "Initializing MariaDB..."
-  $MARIADB_INSTALLDB_EXECUTABLE \
-    --socket="$MARIADB_SOCKET" \
-    --datadir="$MARIADB_DATADIR" \
-    --tmpdir="$MARIADB_TMPDIR" \
-    --lc-messages-dir="$MARIADB_LC_MESSAGES_DIR"
-fi
+# if [ ! -d "$MARIADB_DATADIR/mysql" ]; then
+#   echo "Initializing MariaDB..."
+#   $MARIADB_INSTALLDB_EXECUTABLE \
+#     --socket="$MARIADB_SOCKET" \
+#     --datadir="$MARIADB_DATADIR" \
+#     --tmpdir="$MARIADB_TMPDIR" \
+#     --lc-messages-dir="$MARIADB_LC_MESSAGES_DIR"
+# fi
 
 
 # Start supervisord

databases/mariadb/mariadb-11.7/template/etc/supervisord.conf

@@ -2,9 +2,9 @@
 nodaemon=true
 user=container
 
+
 [program:mariadb]
-command=/usr/sbin/mariadbd --socket=/home/container/run/mysqld/mysqld.sock --datadir=/home/container/mysql --lc-messages-dir=/home/container/mysql/lc/ --port=%(ENV_SERVER_PORT)s --bind-address="0.0.0.0"
-user=container
+command=/usr/sbin/mariadbd --socket=/home/container/run/mysqld/mysqld.sock --datadir=/home/container/mysql --lc-messages-dir=/home/container/mysql/lc/ --pid-file=/home/container/run/mysqld/mysqld.pid  --port=%(ENV_SERVER_PORT)s --bind-address="0.0.0.0"
 autostart=true
 autorestart=false
 stdout_logfile=/dev/fd/1
@@ -14,7 +14,6 @@ stderr_logfile_maxbytes=0
 
 [program:php-fpm]
 command=/usr/sbin/php-fpm8.3 -F -p /home/container/run/php -y /etc/php/8.3/fpm/php-fpm.conf
-user=container
 autostart=true
 autorestart=false
 stdout_logfile=/dev/fd/1
@@ -24,7 +23,6 @@ stderr_logfile_maxbytes=0
 
 [program:caddy]
 command=/usr/bin/caddy start --config /home/container/etc/caddy/Caddyfile
-user=container
 autostart=true
 autorestart=false
 stdout_logfile=/dev/fd/1