From 2bad19b78342e01d703e29b31c2a0328dfffa09b Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Sun, 11 Aug 2024 21:08:39 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dockerfile
rootfs/root/docker/setup/03-files.sh
rootfs/root/docker/setup/05-custom.sh
---
 Dockerfile                            | 2 +-
 rootfs/root/docker/setup/03-files.sh  | 3 ++-
 rootfs/root/docker/setup/05-custom.sh | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 745a707..cac8684 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:experimental
+# syntax=docker/dockerfile:1
 # Docker image for mysql using the alpine template
 ARG IMAGE_NAME="mysql"
 ARG PHP_SERVER="mysql"
diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh
index ef99fbf..83861ad 100755
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -27,7 +27,8 @@ exitCode=0
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-copy "/tmp/etc/." "/etc/"
+symlink "/etc/mysql/my.cnf" "/etc/my.cnf"
+[ -d "/tmp/etc" ] && copy "/tmp/etc/." "/etc/"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh
index 201a796..2c04e36 100755
--- a/rootfs/root/docker/setup/05-custom.sh
+++ b/rootfs/root/docker/setup/05-custom.sh
@@ -32,16 +32,14 @@ PHPMYADMIN_DOWNLOAD_URL="https://files.phpmyadmin.net/phpMyAdmin/${PHPMYADMIN_VE
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
 echo "Installing phpmyadmin from $PHPMYADMIN_DOWNLOAD_URL"
-[ -e "/etc/my.cnf" ] && rm -Rf "/etc/my.cnf"
 [ -d "$PHPMYADMIN_WWW_ROOT" ] && rm -Rf "$PHPMYADMIN_WWW_ROOT"
 if curl -q -LSsf "$PHPMYADMIN_DOWNLOAD_URL" -o "/tmp/phpmyadmin.zip"; then
-  mkdir -p "$PHPMYADMIN_WWW_ROOT" "/etc/phpmyadmin"
   unzip -q "/tmp/phpmyadmin.zip" -d "/tmp" && rm -Rf "/tmp/phpmyadmin.zip"
   mv -f "/tmp/phpMyAdmin-${PHPMYADMIN_VERSION}-all-languages" "$PHPMYADMIN_WWW_ROOT"
   git clone --depth 1 "https://github.com/phpmyadmin/themes" "/tmp/themes"
-  for d in blueberry boodark bootstrap dark-orange darkmod-neo darkwolf eyed fallen fistu metro mhn; do
-    mkdir -p "$PHPMYADMIN_WWW_ROOT/themes/$d" &&
-      [ -d "/tmp/themes/$d" ] && copy "/tmp/themes/$d/." "$PHPMYADMIN_WWW_ROOT/themes/$d/"
+  for theme in blueberry boodark bootstrap dark-orange darkmod-neo darkwolf eyed fallen fistu metro mhn; do
+    echo "Installing $theme to $PHPMYADMIN_WWW_ROOT/themes/$theme"
+    mkdir -p "$PHPMYADMIN_WWW_ROOT/themes/$theme" && [ -d "/tmp/themes/$theme" ] && copy "/tmp/themes/$theme/." "$PHPMYADMIN_WWW_ROOT/themes/$theme/"
   done
   symlink "/etc/phpmyadmin/config.php" "$PHPMYADMIN_WWW_ROOT/config.inc.php"
   chown -Rf $WWW_USER "$PHPMYADMIN_WWW_ROOT"