Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-14 06:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

5.0.2-debian-10-r132 release

Browse Source
This commit is contained in:
Bitnami Bot
2020-08-19 00:19:21 +00:00
parent a349770fc1
commit f89413fc69
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/phpmyadmin/5/debian-10/Dockerfile
View File

@@ -30,7 +30,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTPS_PORT_NUMBER="" \
APACHE_HTTP_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \
BITNAMI_APP_NAME="phpmyadmin" \ BITNAMI_APP_NAME="phpmyadmin" \
BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r131" \ BITNAMI_IMAGE_VERSION="5.0.2-debian-10-r132" \
MARIADB_HOST="mariadb" \ MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \ MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \ MARIADB_ROOT_PASSWORD="" \

38
bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
View File

@@ -6,6 +6,7 @@
# Load Generic Libraries # Load Generic Libraries
. /opt/bitnami/scripts/libvalidations.sh . /opt/bitnami/scripts/libvalidations.sh
. /opt/bitnami/scripts/liblog.sh
# Functions # Functions
@@ -175,23 +176,42 @@ EOF
######################## ########################
# Generate a logrotate configuration file # Generate a logrotate configuration file
# Arguments: # Arguments:
# $1 - Log path # $1 - Service name
# $2 - Period # $2 - Log files pattern
# $3 - Number of rotations to store # Flags:
# $4 - Extra options (Optional) # --period - Period
# --rotations - Number of rotations to store
# --extra - Extra options (Optional)
# Returns: # Returns:
# None # None
######################### #########################
generate_logrotate_conf() { generate_logrotate_conf() {
local service_name="${1:?service name is missing}" local service_name="${1:?service name is missing}"
local log_path="${2:?log path is missing}" local log_path="${2:?log path is missing}"
local period="${3:-weekly}" local period="weekly"
local rotations="${4:-150}" local rotations="150"
local extra_options="${5:-}" local extra=""
local logrotate_conf_dir="/etc/logrotate.d" local logrotate_conf_dir="/etc/logrotate.d"
local var_name
# Parse optional CLI flags
shift 2
while [[ "$#" -gt 0 ]]; do
case "$1" in
--period|--rotations|--extra)
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
shift
declare "$var_name"="${1:?"$var_name" is missing}"
;;
*)
echo "Invalid command line flag ${1}" >&2
return 1
;;
esac
shift
done
mkdir -p "$logrotate_conf_dir" mkdir -p "$logrotate_conf_dir"
cat >"${logrotate_conf_dir}/${service_name}" <<EOF cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
${log_path} { ${log_path} {
${period} ${period}
rotate ${rotations} rotate ${rotations}
@@ -199,7 +219,7 @@ ${log_path} {
compress compress
copytruncate copytruncate
missingok missingok
${extra_options} $(indent "$extra" 2)
} }
EOF EOF
} }

4
bitnami/phpmyadmin/5/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh
View File

@@ -20,8 +20,8 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
apache_env_vars=( apache_env_vars=(
APACHE_HTTP_PORT_NUMBER APACHE_HTTP_PORT_NUMBER
APACHE_HTTPS_PORT_NUMBER APACHE_HTTPS_PORT_NUMBER
APACHE_HTTP_PORT
APACHE_HTTPS_PORT APACHE_HTTPS_PORT
WEB_SERVER_HTTPS_PORT
) )
for env_var in "${apache_env_vars[@]}"; do for env_var in "${apache_env_vars[@]}"; do
file_env_var="${env_var}_FILE" file_env_var="${env_var}_FILE"
@@ -59,10 +59,10 @@ export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" # only used at build time
export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER" export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER"
export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" # only used at build time
export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER"
APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-"${APACHE_HTTP_PORT:-}"}"
export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}" export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}"
export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER" export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER"
APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}"
APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${WEB_SERVER_HTTPS_PORT:-}"}"
export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}"
export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER" export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER"

2
bitnami/phpmyadmin/README.md
View File

@@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
* [`5-debian-10`, `5.0.2-debian-10-r131`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r131/5/debian-10/Dockerfile) * [`5-debian-10`, `5.0.2-debian-10-r132`, `5`, `5.0.2`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.0.2-debian-10-r132/5/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin). Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).