[bitnami/phpmyadmin] Release 5.2.2-debian-12-r23 (#85498)
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
This commit is contained in:
parent
e9574f3e3e
commit
d1813c67a1
|
|
@ -8,7 +8,7 @@ ARG TARGETARCH
|
||||||
|
|
||||||
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
|
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
|
||||||
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
|
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
|
||||||
org.opencontainers.image.created="2025-08-18T11:35:26Z" \
|
org.opencontainers.image.created="2025-08-19T18:18:21Z" \
|
||||||
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
|
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
|
||||||
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin/README.md" \
|
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin/README.md" \
|
||||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin" \
|
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/phpmyadmin" \
|
||||||
|
|
@ -60,6 +60,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
|
||||||
APACHE_HTTP_PORT_NUMBER="" \
|
APACHE_HTTP_PORT_NUMBER="" \
|
||||||
APP_VERSION="5.2.2" \
|
APP_VERSION="5.2.2" \
|
||||||
BITNAMI_APP_NAME="phpmyadmin" \
|
BITNAMI_APP_NAME="phpmyadmin" \
|
||||||
|
IMAGE_REVISION="23" \
|
||||||
PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH"
|
PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH"
|
||||||
|
|
||||||
EXPOSE 8080 8443
|
EXPOSE 8080 8443
|
||||||
|
|
|
||||||
|
|
@ -142,80 +142,6 @@ EOF
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Remove a cron configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
remove_cron_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local cron_conf_dir="/etc/monit/conf.d"
|
|
||||||
rm -f "${cron_conf_dir}/${service_name}"
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Generate a monit configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# $2 - Pid file
|
|
||||||
# $3 - Start command
|
|
||||||
# $4 - Stop command
|
|
||||||
# Flags:
|
|
||||||
# --disable - Whether to disable the monit configuration
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
generate_monit_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local pid_file="${2:?pid file is missing}"
|
|
||||||
local start_command="${3:?start command is missing}"
|
|
||||||
local stop_command="${4:?stop command is missing}"
|
|
||||||
local monit_conf_dir="/etc/monit/conf.d"
|
|
||||||
local disabled="no"
|
|
||||||
|
|
||||||
# Parse optional CLI flags
|
|
||||||
shift 4
|
|
||||||
while [[ "$#" -gt 0 ]]; do
|
|
||||||
case "$1" in
|
|
||||||
--disable)
|
|
||||||
disabled="yes"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Invalid command line flag ${1}" >&2
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
is_boolean_yes "$disabled" && conf_suffix=".disabled"
|
|
||||||
mkdir -p "$monit_conf_dir"
|
|
||||||
cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
check process ${service_name}
|
|
||||||
with pidfile "${pid_file}"
|
|
||||||
start program = "${start_command}" with timeout 90 seconds
|
|
||||||
stop program = "${stop_command}" with timeout 90 seconds
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Remove a monit configuration file for a given service
|
|
||||||
# Arguments:
|
|
||||||
# $1 - Service name
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
remove_monit_conf() {
|
|
||||||
local service_name="${1:?service name is missing}"
|
|
||||||
local monit_conf_dir="/etc/monit/conf.d"
|
|
||||||
rm -f "${monit_conf_dir}/${service_name}.conf"
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Generate a logrotate configuration file
|
# Generate a logrotate configuration file
|
||||||
# Arguments:
|
# Arguments:
|
||||||
|
|
|
||||||
|
|
@ -139,41 +139,6 @@ web_server_stop() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Restart web server
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_restart() {
|
|
||||||
info "Restarting $(web_server_type)"
|
|
||||||
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
|
|
||||||
systemctl restart "bitnami.$(web_server_type).service"
|
|
||||||
else
|
|
||||||
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Reload web server
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_reload() {
|
|
||||||
if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
|
|
||||||
systemctl reload "bitnami.$(web_server_type).service"
|
|
||||||
else
|
|
||||||
"${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
|
# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
|
||||||
# It serves as a wrapper for the specific web server function
|
# It serves as a wrapper for the specific web server function
|
||||||
|
|
@ -429,48 +394,3 @@ web_server_update_app_configuration() {
|
||||||
web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
|
web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
########################
|
|
||||||
# Enable loading page, which shows users that the initialization process is not yet completed
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_enable_loading_page() {
|
|
||||||
ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \
|
|
||||||
--apache-additional-configuration "
|
|
||||||
# Show a HTTP 503 Service Unavailable page by default
|
|
||||||
RedirectMatch 503 ^/$
|
|
||||||
# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
|
|
||||||
ErrorDocument 404 /index.html
|
|
||||||
ErrorDocument 503 /index.html" \
|
|
||||||
--nginx-additional-configuration "
|
|
||||||
# Show a HTTP 503 Service Unavailable page by default
|
|
||||||
location / {
|
|
||||||
return 503;
|
|
||||||
}
|
|
||||||
# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
|
|
||||||
error_page 404 @installing;
|
|
||||||
error_page 503 @installing;
|
|
||||||
location @installing {
|
|
||||||
rewrite ^(.*)$ /index.html break;
|
|
||||||
}"
|
|
||||||
web_server_reload
|
|
||||||
}
|
|
||||||
|
|
||||||
########################
|
|
||||||
# Enable loading page, which shows users that the initialization process is not yet completed
|
|
||||||
# Globals:
|
|
||||||
# *
|
|
||||||
# Arguments:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#########################
|
|
||||||
web_server_disable_install_page() {
|
|
||||||
ensure_web_server_app_configuration_not_exists "__loading"
|
|
||||||
web_server_reload
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libapache.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
|
|
||||||
# Load Apache environment
|
|
||||||
. /opt/bitnami/scripts/apache-env.sh
|
|
||||||
|
|
||||||
info "** Reloading Apache configuration **"
|
|
||||||
exec "${APACHE_BIN_DIR}/apachectl" -k graceful
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libapache.sh
|
|
||||||
|
|
||||||
# Load Apache environment variables
|
|
||||||
. /opt/bitnami/scripts/apache-env.sh
|
|
||||||
|
|
||||||
/opt/bitnami/scripts/apache/stop.sh
|
|
||||||
/opt/bitnami/scripts/apache/start.sh
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libapache.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
|
|
||||||
# Load Apache environment variables
|
|
||||||
. /opt/bitnami/scripts/apache-env.sh
|
|
||||||
|
|
||||||
if is_apache_running; then
|
|
||||||
info "apache is already running"
|
|
||||||
else
|
|
||||||
info "apache is not running"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1090,SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libphp.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
. /opt/bitnami/scripts/libwebserver.sh
|
|
||||||
|
|
||||||
# Load PHP-FPM environment
|
|
||||||
. /opt/bitnami/scripts/php-env.sh
|
|
||||||
|
|
||||||
# Load web server environment and functions
|
|
||||||
. "/opt/bitnami/scripts/$(web_server_type)-env.sh"
|
|
||||||
|
|
||||||
error_code=0
|
|
||||||
|
|
||||||
if is_php_fpm_enabled; then
|
|
||||||
if is_php_fpm_not_running; then
|
|
||||||
error "php-fpm is not running"
|
|
||||||
error_code=1
|
|
||||||
else
|
|
||||||
info "** Reloading PHP-FPM configuration **"
|
|
||||||
php_fpm_reload
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
web_server_reload
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit "$error_code"
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libphp.sh
|
|
||||||
|
|
||||||
# Load PHP-FPM environment variables
|
|
||||||
. /opt/bitnami/scripts/php-env.sh
|
|
||||||
|
|
||||||
/opt/bitnami/scripts/php/stop.sh
|
|
||||||
/opt/bitnami/scripts/php/start.sh
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libphp.sh
|
|
||||||
. /opt/bitnami/scripts/libos.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
|
|
||||||
# Load PHP-FPM environment variables
|
|
||||||
. /opt/bitnami/scripts/php-env.sh
|
|
||||||
|
|
||||||
error_code=0
|
|
||||||
|
|
||||||
if is_php_fpm_not_running; then
|
|
||||||
nohup /opt/bitnami/scripts/php/run.sh >/dev/null 2>&1 &
|
|
||||||
if ! retry_while "is_php_fpm_running"; then
|
|
||||||
error "php-fpm did not start"
|
|
||||||
error_code=1
|
|
||||||
else
|
|
||||||
info "php-fpm started"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
info "php-fpm is already running"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit "$error_code"
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libphp.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
|
|
||||||
# Load PHP-FPM environment variables
|
|
||||||
. /opt/bitnami/scripts/php-env.sh
|
|
||||||
|
|
||||||
if is_php_fpm_running; then
|
|
||||||
info "php-fpm is already running"
|
|
||||||
else
|
|
||||||
info "php-fpm is not running"
|
|
||||||
fi
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
# Copyright Broadcom, Inc. All Rights Reserved.
|
|
||||||
# SPDX-License-Identifier: APACHE-2.0
|
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o nounset
|
|
||||||
set -o pipefail
|
|
||||||
# set -o xtrace # Uncomment this line for debugging purposes
|
|
||||||
|
|
||||||
# Load libraries
|
|
||||||
. /opt/bitnami/scripts/libphp.sh
|
|
||||||
. /opt/bitnami/scripts/libos.sh
|
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
|
||||||
|
|
||||||
# Load PHP-FPM environment variables
|
|
||||||
. /opt/bitnami/scripts/php-env.sh
|
|
||||||
|
|
||||||
error_code=0
|
|
||||||
|
|
||||||
if is_php_fpm_running; then
|
|
||||||
BITNAMI_QUIET=1 php_fpm_stop
|
|
||||||
if ! retry_while "is_php_fpm_not_running"; then
|
|
||||||
error "php-fpm could not be stopped"
|
|
||||||
error_code=1
|
|
||||||
else
|
|
||||||
info "php-fpm stopped"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
info "php-fpm is not running"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit "$error_code"
|
|
||||||
Loading…
Reference in New Issue