🗃️ Committing everything that changed 🗃️
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:
casjay 2024-09-07 09:59:08 -04:00
parent f2edcc0cb9
commit e2cf8eb9a9
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
5 changed files with 6 additions and 6 deletions

View File

@ -29,7 +29,7 @@ ENV_IMAGE_TAG="latest"
ENV_ADD_TAGS="" ENV_ADD_TAGS=""
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Pull image info # Pull image info
ENV_PULL_URL="casjaysdev/php" ENV_PULL_URL="casjaysdev/nginx"
ENV_DISTRO_TAG="${IMAGE_VERSION}" ENV_DISTRO_TAG="${IMAGE_VERSION}"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Env # Env

View File

@ -24,7 +24,7 @@ ARG IMAGE_REPO="casjaysdevdocker/mysql"
ARG IMAGE_VERSION="latest" ARG IMAGE_VERSION="latest"
ARG CONTAINER_VERSION="" ARG CONTAINER_VERSION=""
ARG PULL_URL="casjaysdevdocker/php" ARG PULL_URL="casjaysdevdocker/nginx"
ARG DISTRO_VERSION="${IMAGE_VERSION}" ARG DISTRO_VERSION="${IMAGE_VERSION}"
ARG BUILD_VERSION="${BUILD_DATE}" ARG BUILD_VERSION="${BUILD_DATE}"

View File

@ -27,8 +27,8 @@ exitCode=0
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Main script # Main script
symlink "/etc/mysql/my.cnf" "/etc/my.cnf"
[ -d "/tmp/etc" ] && copy "/tmp/etc/." "/etc/" [ -d "/tmp/etc" ] && copy "/tmp/etc/." "/etc/"
[ -f "/etc/mysql/my.cnf" ] && symlink "/etc/mysql/my.cnf" "/etc/my.cnf"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Set the exit code # Set the exit code
exitCode=$? exitCode=$?

View File

@ -77,6 +77,6 @@ http {
} }
location /phpmyadmin { location /phpmyadmin {
alias REPLACE_PHPMYADMIN_WWW_ROOT; alias /usr/share/phpmyadmin;
} }
} }

View File

@ -264,8 +264,8 @@ __post_execute() {
local postMessageST="Running post commands for $SERVICE_NAME" # message to show at start 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 postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
local root_user_pass="${DATABASE_ROOT_PASSWORD:-$(__random_password)}" local root_user_pass="${root_user_pass:-$DATABASE_ROOT_PASSWORD:-$}"
local DATABASE_ROOT_PASSWORD="${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" echo "$DATABASE_ROOT_PASSWORD" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"
# wait # wait
sleep $waitTime sleep $waitTime