From 98ed77593ebf9a2d6687fe68460832e82d412991 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 20 Sep 2023 08:57:30 +0200 Subject: [PATCH] Adds auto deploy of the official images. gh-163 --- 4.3/php8.0/apache/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.0/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.0/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.1/apache/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.1/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.1/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.2/apache/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.2/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.3/php8.2/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.0/apache/docker-entrypoint.sh | 116 +++++++++++++-- .../php8.0/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.0/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.1/apache/docker-entrypoint.sh | 116 +++++++++++++-- .../php8.1/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.1/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.2/apache/docker-entrypoint.sh | 116 +++++++++++++-- .../php8.2/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 4.4.beta/php8.2/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 5.0.beta/php8.1/apache/docker-entrypoint.sh | 116 +++++++++++++-- .../php8.1/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 5.0.beta/php8.1/fpm/docker-entrypoint.sh | 116 +++++++++++++-- 5.0.beta/php8.2/apache/docker-entrypoint.sh | 116 +++++++++++++-- .../php8.2/fpm-alpine/docker-entrypoint.sh | 116 +++++++++++++-- 5.0.beta/php8.2/fpm/docker-entrypoint.sh | 116 +++++++++++++-- apply-templates.sh | 10 +- docker-entrypoint-3.10.sh | 135 ++++++++++++++++++ docker-entrypoint.sh | 116 +++++++++++++-- 27 files changed, 2843 insertions(+), 202 deletions(-) create mode 100755 docker-entrypoint-3.10.sh diff --git a/4.3/php8.0/apache/docker-entrypoint.sh b/4.3/php8.0/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.0/apache/docker-entrypoint.sh +++ b/4.3/php8.0/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.0/fpm-alpine/docker-entrypoint.sh b/4.3/php8.0/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.0/fpm-alpine/docker-entrypoint.sh +++ b/4.3/php8.0/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.0/fpm/docker-entrypoint.sh b/4.3/php8.0/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.0/fpm/docker-entrypoint.sh +++ b/4.3/php8.0/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.1/apache/docker-entrypoint.sh b/4.3/php8.1/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.1/apache/docker-entrypoint.sh +++ b/4.3/php8.1/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.1/fpm-alpine/docker-entrypoint.sh b/4.3/php8.1/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.1/fpm-alpine/docker-entrypoint.sh +++ b/4.3/php8.1/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.1/fpm/docker-entrypoint.sh b/4.3/php8.1/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.1/fpm/docker-entrypoint.sh +++ b/4.3/php8.1/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.2/apache/docker-entrypoint.sh b/4.3/php8.2/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.2/apache/docker-entrypoint.sh +++ b/4.3/php8.2/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.2/fpm-alpine/docker-entrypoint.sh b/4.3/php8.2/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.2/fpm-alpine/docker-entrypoint.sh +++ b/4.3/php8.2/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.3/php8.2/fpm/docker-entrypoint.sh b/4.3/php8.2/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.3/php8.2/fpm/docker-entrypoint.sh +++ b/4.3/php8.2/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.0/apache/docker-entrypoint.sh b/4.4.beta/php8.0/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.0/apache/docker-entrypoint.sh +++ b/4.4.beta/php8.0/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.0/fpm-alpine/docker-entrypoint.sh b/4.4.beta/php8.0/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.0/fpm-alpine/docker-entrypoint.sh +++ b/4.4.beta/php8.0/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.0/fpm/docker-entrypoint.sh b/4.4.beta/php8.0/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.0/fpm/docker-entrypoint.sh +++ b/4.4.beta/php8.0/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.1/apache/docker-entrypoint.sh b/4.4.beta/php8.1/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.1/apache/docker-entrypoint.sh +++ b/4.4.beta/php8.1/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.1/fpm-alpine/docker-entrypoint.sh b/4.4.beta/php8.1/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.1/fpm-alpine/docker-entrypoint.sh +++ b/4.4.beta/php8.1/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.1/fpm/docker-entrypoint.sh b/4.4.beta/php8.1/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.1/fpm/docker-entrypoint.sh +++ b/4.4.beta/php8.1/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.2/apache/docker-entrypoint.sh b/4.4.beta/php8.2/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.2/apache/docker-entrypoint.sh +++ b/4.4.beta/php8.2/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.2/fpm-alpine/docker-entrypoint.sh b/4.4.beta/php8.2/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.2/fpm-alpine/docker-entrypoint.sh +++ b/4.4.beta/php8.2/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/4.4.beta/php8.2/fpm/docker-entrypoint.sh b/4.4.beta/php8.2/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/4.4.beta/php8.2/fpm/docker-entrypoint.sh +++ b/4.4.beta/php8.2/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.1/apache/docker-entrypoint.sh b/5.0.beta/php8.1/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.1/apache/docker-entrypoint.sh +++ b/5.0.beta/php8.1/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.1/fpm-alpine/docker-entrypoint.sh b/5.0.beta/php8.1/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.1/fpm-alpine/docker-entrypoint.sh +++ b/5.0.beta/php8.1/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.1/fpm/docker-entrypoint.sh b/5.0.beta/php8.1/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.1/fpm/docker-entrypoint.sh +++ b/5.0.beta/php8.1/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.2/apache/docker-entrypoint.sh b/5.0.beta/php8.2/apache/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.2/apache/docker-entrypoint.sh +++ b/5.0.beta/php8.2/apache/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.2/fpm-alpine/docker-entrypoint.sh b/5.0.beta/php8.2/fpm-alpine/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.2/fpm-alpine/docker-entrypoint.sh +++ b/5.0.beta/php8.2/fpm-alpine/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/5.0.beta/php8.2/fpm/docker-entrypoint.sh b/5.0.beta/php8.2/fpm/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/5.0.beta/php8.2/fpm/docker-entrypoint.sh +++ b/5.0.beta/php8.2/fpm/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@" diff --git a/apply-templates.sh b/apply-templates.sh index 92ff433e..d689d1f0 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -35,6 +35,12 @@ export joomlaMaintainers # loop over the version set above for version; do export version + # see if we version specific entrypoint file + if [[ -e "docker-entrypoint-${version}.sh" ]]; then + docker_entrypoint="docker-entrypoint-${version}.sh" + else + docker_entrypoint="docker-entrypoint.sh" + fi # get this Joomla version details joomlaVersionDetails="$(jq -r '.[env.version]' versions.json)" # get this Joomla version @@ -81,9 +87,9 @@ for version; do echo "processing $dir ..." # move the entrypoint file into place - cp -a "docker-entrypoint.sh" "$dir/docker-entrypoint.sh" + cp -a "$docker_entrypoint" "$dir/docker-entrypoint.sh" # move the make database file into place - cp -a "makedb.php" "$dir/makedb.php" + cp -a "makedb.php" "$dir/makedb.php" { generated_warning diff --git a/docker-entrypoint-3.10.sh b/docker-entrypoint-3.10.sh new file mode 100755 index 00000000..080a2ace --- /dev/null +++ b/docker-entrypoint-3.10.sh @@ -0,0 +1,135 @@ +#!/bin/bash +set -e + +if [ -n "$JOOMLA_DB_PASSWORD_FILE" ] && [ -f "$JOOMLA_DB_PASSWORD_FILE" ]; then + JOOMLA_DB_PASSWORD=$(cat "$JOOMLA_DB_PASSWORD_FILE") +fi + +if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then + uid="$(id -u)" + gid="$(id -g)" + if [ "$uid" = '0' ]; then + case "$1" in + apache2*) + user="${APACHE_RUN_USER:-www-data}" + group="${APACHE_RUN_GROUP:-www-data}" + + # strip off any '#' symbol ('#1000' is valid syntax for Apache) + pound='#' + user="${user#$pound}" + group="${group#$pound}" + + # set user if not exist + if ! id "$user" &>/dev/null; then + # get the user name + : "${USER_NAME:=www-data}" + # change the user name + [[ "$USER_NAME" != "www-data" ]] && + usermod -l "$USER_NAME" www-data && + groupmod -n "$USER_NAME" www-data + # update the user ID + groupmod -o -g "$user" "$USER_NAME" + # update the user-group ID + usermod -o -u "$group" "$USER_NAME" + fi + ;; + *) # php-fpm + user='www-data' + group='www-data' + ;; + esac + else + user="$uid" + group="$gid" + fi + + if [ -n "$MYSQL_PORT_3306_TCP" ]; then + if [ -z "$JOOMLA_DB_HOST" ]; then + JOOMLA_DB_HOST='mysql' + else + echo >&2 "warning: both JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP found" + echo >&2 " Connecting to JOOMLA_DB_HOST ($JOOMLA_DB_HOST)" + echo >&2 " instead of the linked mysql container" + fi + fi + + if [ -z "$JOOMLA_DB_HOST" ]; then + echo >&2 "error: missing JOOMLA_DB_HOST and MYSQL_PORT_3306_TCP environment variables" + echo >&2 " Did you forget to --link some_mysql_container:mysql or set an external db" + echo >&2 " with -e JOOMLA_DB_HOST=hostname:port?" + exit 1 + fi + + # If the DB user is 'root' then use the MySQL root password env var + : "${JOOMLA_DB_USER:=root}" + if [ "$JOOMLA_DB_USER" = 'root' ]; then + : ${JOOMLA_DB_PASSWORD:=$MYSQL_ENV_MYSQL_ROOT_PASSWORD} + fi + : "${JOOMLA_DB_NAME:=joomla}" + + if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then + echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable" + echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?" + echo >&2 + echo >&2 " (Also of interest might be JOOMLA_DB_USER and JOOMLA_DB_NAME.)" + exit 1 + fi + + if [ ! -e index.php ] && [ ! -e libraries/src/Version.php ]; then + # if the directory exists and Joomla doesn't appear to be installed AND the permissions of it are root:root, let's chown it (likely a Docker-created directory) + if [ "$uid" = '0' ] && [ "$(stat -c '%u:%g' .)" = '0:0' ]; then + chown "$user:$group" . + fi + + echo >&2 "Joomla not found in $PWD - copying now..." + if [ "$(ls -A)" ]; then + echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" + ( + set -x + ls -A + sleep 10 + ) + fi + # use full commands + # for clearer intent + sourceTarArgs=( + --create + --file - + --directory /usr/src/joomla + --one-file-system + --owner "$user" --group "$group" + ) + targetTarArgs=( + --extract + --file - + ) + if [ "$uid" != '0' ]; then + # avoid "tar: .: Cannot utime: Operation not permitted" and "tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted" + targetTarArgs+=(--no-overwrite-dir) + fi + + tar "${sourceTarArgs[@]}" . | tar "${targetTarArgs[@]}" + + if [ ! -e .htaccess ]; then + # NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess + sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt >.htaccess + chown "$user":"$group" .htaccess + fi + + echo >&2 "Complete! Joomla has been successfully copied to $PWD" + fi + + # Ensure the MySQL Database is created + php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" +fi + +exec "$@" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 080a2ace..5f8a8ef1 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -122,14 +122,114 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then # Ensure the MySQL Database is created php /makedb.php "$JOOMLA_DB_HOST" "$JOOMLA_DB_USER" "$JOOMLA_DB_PASSWORD" "$JOOMLA_DB_NAME" "${JOOMLA_DB_TYPE:-mysqli}" - echo >&2 "========================================================================" - echo >&2 - echo >&2 "This server is now configured to run Joomla!" - echo >&2 - echo >&2 "NOTE: You will need your database server address, database name," - echo >&2 "and database user credentials to install Joomla." - echo >&2 - echo >&2 "========================================================================" + # Basic email regex for validation + email_regex="^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + + # Function to validate environment variables + validate_vars() { + # Check if JOOMLA_SITE_NAME is longer than 2 characters + if [[ "${#JOOMLA_SITE_NAME}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_SITE_NAME must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USER is longer than 2 characters + if [[ "${#JOOMLA_ADMIN_USER}" -le 2 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USER must be longer than 2 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_USERNAME has no spaces, and is only alphabetical + if [[ "${JOOMLA_ADMIN_USERNAME}" =~ [^a-zA-Z] ]]; then + echo >&2 "Error: JOOMLA_ADMIN_USERNAME must contain no spaces and be only alphabetical!" + return 1 + fi + + # Check if JOOMLA_ADMIN_PASSWORD is longer than 12 characters + if [[ "${#JOOMLA_ADMIN_PASSWORD}" -le 12 ]]; then + echo >&2 "Error: JOOMLA_ADMIN_PASSWORD must be longer than 12 characters!" + return 1 + fi + + # Check if JOOMLA_ADMIN_EMAIL is a valid email + if [[ ! "${JOOMLA_ADMIN_EMAIL}" =~ $email_regex ]]; then + echo >&2 "Error: JOOMLA_ADMIN_EMAIL must be a valid email address!" + return 1 + fi + + # If all checks passed, return 0 + return 0 + } + + # Function to check that auto deploy can be done + can_auto_deploy() { + # Check if all NEEDED variables exist + if [[ -n "${JOOMLA_SITE_NAME}" && -n "${JOOMLA_ADMIN_USER}" && + -n "${JOOMLA_ADMIN_USERNAME}" && -n "${JOOMLA_ADMIN_PASSWORD}" && + -n "${JOOMLA_ADMIN_EMAIL}" ]]; then + + # All variables exist. Now validate them. + if validate_vars; then + # If all checks passed, return 0 + return 0 + fi + fi + + # If any needed variables does not exist fail, return 1 + return 1 + } + + # if the directory exists and we can auto deploy + if [ -d installation ] && [ -e installation/joomla.php ] && can_auto_deploy; then + # use full commands + # for clearer intent + installJoomlaArgs=( + --site-name="${JOOMLA_SITE_NAME}" + --admin-email="${JOOMLA_ADMIN_EMAIL}" + --admin-username="${JOOMLA_ADMIN_USERNAME}" + --admin-user="${JOOMLA_ADMIN_USER}" + --admin-password="${JOOMLA_ADMIN_PASSWORD}" + --db-type="${JOOMLA_DB_TYPE:-mysqli}" + --db-host="${JOOMLA_DB_HOST}" + --db-name="${JOOMLA_DB_NAME}" + --db-pass="${JOOMLA_DB_PASSWORD}" + --db-user="${JOOMLA_DB_USER}" + --db-prefix="${JOOMLA_DB_PREFIX:-joom_}" + --db-encryption=0 + ) + + php installation/joomla.php install "${installJoomlaArgs[@]}" + + # Check the exit status of the PHP command + if [ $? -eq 0 ]; then + # The PHP command succeeded (so we remove the installation folder) + rm -rf installation + + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "========================================================================" + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi + else + echo >&2 "========================================================================" + echo >&2 + echo >&2 "This server is now configured to run Joomla!" + echo >&2 + echo >&2 "NOTE: You will need your database server address, database name," + echo >&2 "and database user credentials to install Joomla." + echo >&2 + echo >&2 "========================================================================" + fi fi exec "$@"