mirror of
https://github.com/casjaysdevdocker/mysql
synced 2024-11-22 23:23:07 -05:00
🗃️ Committing everything that changed 🗃️
Some checks failed
release-tag / release-image (push) Failing after 20s
Some checks failed
release-tag / release-image (push) Failing after 20s
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
This commit is contained in:
parent
f2edcc0cb9
commit
e2cf8eb9a9
@ -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
|
||||
|
@ -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}"
|
||||
|
||||
|
@ -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=$?
|
||||
|
@ -77,6 +77,6 @@ http {
|
||||
}
|
||||
|
||||
location /phpmyadmin {
|
||||
alias REPLACE_PHPMYADMIN_WWW_ROOT;
|
||||
alias /usr/share/phpmyadmin;
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user