From e2cf8eb9a9dabf78ed2c55a4d33ddcbbda6fd964 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Sat, 7 Sep 2024 09:59:08 -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
.env.scripts
rootfs/root/docker/setup/03-files.sh
rootfs/tmp/etc/nginx/nginx.conf
rootfs/usr/local/etc/docker/init.d/00-mysqld.sh
---
 .env.scripts                                    | 2 +-
 Dockerfile                                      | 2 +-
 rootfs/root/docker/setup/03-files.sh            | 2 +-
 rootfs/tmp/etc/nginx/nginx.conf                 | 2 +-
 rootfs/usr/local/etc/docker/init.d/00-mysqld.sh | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.env.scripts b/.env.scripts
index 5994728..4a5358c 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -29,7 +29,7 @@ ENV_IMAGE_TAG="latest"
 ENV_ADD_TAGS=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Pull image info
-ENV_PULL_URL="casjaysdev/php"
+ENV_PULL_URL="casjaysdev/nginx"
 ENV_DISTRO_TAG="${IMAGE_VERSION}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Env
diff --git a/Dockerfile b/Dockerfile
index cac8684..4ba5efb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ ARG IMAGE_REPO="casjaysdevdocker/mysql"
 ARG IMAGE_VERSION="latest"
 ARG CONTAINER_VERSION=""
 
-ARG PULL_URL="casjaysdevdocker/php"
+ARG PULL_URL="casjaysdevdocker/nginx"
 ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh
index abdc6d8..95543f7 100755
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -27,8 +27,8 @@ exitCode=0
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-symlink "/etc/mysql/my.cnf" "/etc/my.cnf"
 [ -d "/tmp/etc" ] && copy "/tmp/etc/." "/etc/"
+[ -f "/etc/mysql/my.cnf" ] && symlink "/etc/mysql/my.cnf" "/etc/my.cnf"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 exitCode=$?
diff --git a/rootfs/tmp/etc/nginx/nginx.conf b/rootfs/tmp/etc/nginx/nginx.conf
index 905b47e..bcb2c95 100644
--- a/rootfs/tmp/etc/nginx/nginx.conf
+++ b/rootfs/tmp/etc/nginx/nginx.conf
@@ -77,6 +77,6 @@ http {
         }
 
         location /phpmyadmin {
-            alias           REPLACE_PHPMYADMIN_WWW_ROOT;
+            alias           /usr/share/phpmyadmin;
         }
 }
diff --git a/rootfs/usr/local/etc/docker/init.d/00-mysqld.sh b/rootfs/usr/local/etc/docker/init.d/00-mysqld.sh
index afdc84f..d9b1381 100755
--- a/rootfs/usr/local/etc/docker/init.d/00-mysqld.sh
+++ b/rootfs/usr/local/etc/docker/init.d/00-mysqld.sh
@@ -264,8 +264,8 @@ __post_execute() {
   local postMessageST="Running post commands for $SERVICE_NAME"   # message to show at start
   local postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
   local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"  # set hostname
-  local root_user_pass="${DATABASE_ROOT_PASSWORD:-$(__random_password)}"
-  local DATABASE_ROOT_PASSWORD="${root_user_pass:-$DATABASE_ROOT_PASSWORD}"
+  local root_user_pass="${root_user_pass:-$DATABASE_ROOT_PASSWORD:-$}"
+  local DATABASE_ROOT_PASSWORD="${root_user_pass:-$(__random_password)}"
   echo "$DATABASE_ROOT_PASSWORD" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"
   # wait
   sleep $waitTime