From d1813c67a1c1793eb9f101e6bef06cf4f7d1f13e Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 19 Aug 2025 20:47:03 +0200 Subject: [PATCH] [bitnami/phpmyadmin] Release 5.2.2-debian-12-r23 (#85498) Signed-off-by: Bitnami Bot --- bitnami/phpmyadmin/5/debian-12/Dockerfile | 3 +- .../opt/bitnami/scripts/libservice.sh | 74 ----------------- .../opt/bitnami/scripts/libwebserver.sh | 80 ------------------- .../opt/bitnami/scripts/apache/reload.sh | 20 ----- .../opt/bitnami/scripts/apache/restart.sh | 19 ----- .../opt/bitnami/scripts/apache/status.sh | 23 ------ .../rootfs/opt/bitnami/scripts/php/reload.sh | 37 --------- .../rootfs/opt/bitnami/scripts/php/restart.sh | 19 ----- .../rootfs/opt/bitnami/scripts/php/start.sh | 34 -------- .../rootfs/opt/bitnami/scripts/php/status.sh | 23 ------ .../rootfs/opt/bitnami/scripts/php/stop.sh | 34 -------- 11 files changed, 2 insertions(+), 364 deletions(-) delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/reload.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/restart.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/apache/status.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/reload.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/restart.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/start.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/status.sh delete mode 100755 bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/stop.sh diff --git a/bitnami/phpmyadmin/5/debian-12/Dockerfile b/bitnami/phpmyadmin/5/debian-12/Dockerfile index 9fac5537f9b6..2c878d4e12a4 100644 --- a/bitnami/phpmyadmin/5/debian-12/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-12/Dockerfile @@ -8,7 +8,7 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ 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.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" \ @@ -60,6 +60,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ APP_VERSION="5.2.2" \ 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" EXPOSE 8080 8443 diff --git a/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh index 1f9b33096b02..886962ebd276 100644 --- a/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/phpmyadmin/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -142,80 +142,6 @@ EOF 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:-}" </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" diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/status.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/status.sh deleted file mode 100755 index 2ca4fb384d05..000000000000 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/status.sh +++ /dev/null @@ -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 diff --git a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/stop.sh b/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/stop.sh deleted file mode 100755 index 74274a4b4ee3..000000000000 --- a/bitnami/phpmyadmin/5/debian-12/rootfs/opt/bitnami/scripts/php/stop.sh +++ /dev/null @@ -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"