2.3.5-debian-10-r56 release
This commit is contained in:
Bitnami Bot
parent
20cc314406
commit
a4b27e2737
|
|
@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
|
|||
APACHE_HTTPS_PORT_NUMBER="443" \
|
||||
APACHE_HTTP_PORT_NUMBER="80" \
|
||||
BITNAMI_APP_NAME="magento" \
|
||||
BITNAMI_IMAGE_VERSION="2.3.5-debian-10-r55" \
|
||||
BITNAMI_IMAGE_VERSION="2.3.5-debian-10-r56" \
|
||||
ELASTICSEARCH_HOST="" \
|
||||
ELASTICSEARCH_PORT_NUMBER="" \
|
||||
EXTERNAL_HTTPS_PORT_NUMBER="443" \
|
||||
|
|
|
|||
|
|
@ -1,21 +1,31 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Post-init script to execute PHP files
|
||||
# Executes custom PHP init scripts
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
# set -o xtrace # Uncomment this line for debugging purposes
|
||||
|
||||
. /opt/bitnami/base/functions
|
||||
# Load libraries with logging functions
|
||||
if [[ -f /opt/bitnami/base/functions ]]; then
|
||||
. /opt/bitnami/base/functions
|
||||
else
|
||||
. /opt/bitnami/scripts/liblog.sh
|
||||
fi
|
||||
|
||||
readonly f="${1:?missing PHP file}"
|
||||
# Loop through all input files passed via stdin
|
||||
read -r -a custom_init_scripts <<< "$@"
|
||||
failure=0
|
||||
if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
|
||||
for custom_init_script in "${custom_init_scripts[@]}"; do
|
||||
[[ "$custom_init_script" != *".php" ]] && continue
|
||||
info "Executing ${custom_init_script} with PHP interpreter"
|
||||
php "$custom_init_script" || failure=1
|
||||
[[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ "$f" == *".php" ]]; then
|
||||
info "Executing $f with PHP interpreter"
|
||||
php "$f" || failure=$?
|
||||
fi
|
||||
if [[ "$failure" -ne 0 ]]; then
|
||||
error "Failed to execute ${f}"
|
||||
exit "$failure"
|
||||
fi
|
||||
exit "$failure"
|
||||
|
|
|
|||
|
|
@ -1,24 +1,37 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Post-init script to execute Shell files
|
||||
# Executes custom Bash init scripts
|
||||
|
||||
# shellcheck disable=SC1090,SC1091
|
||||
# shellcheck disable=SC1090
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
# set -o xtrace # Uncomment this line for debugging purposes
|
||||
|
||||
. /opt/bitnami/base/functions
|
||||
# Load libraries with logging functions
|
||||
if [[ -f /opt/bitnami/base/functions ]]; then
|
||||
. /opt/bitnami/base/functions
|
||||
else
|
||||
. /opt/bitnami/scripts/liblog.sh
|
||||
fi
|
||||
|
||||
readonly f="${1:?missing SHELL file}"
|
||||
# Loop through all input files passed via stdin
|
||||
read -r -a custom_init_scripts <<< "$@"
|
||||
failure=0
|
||||
if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
|
||||
for custom_init_script in "${custom_init_scripts[@]}"; do
|
||||
[[ "$custom_init_script" != *".sh" ]] && continue
|
||||
if [[ -x "$custom_init_script" ]]; then
|
||||
info "Executing ${custom_init_script}"
|
||||
"$custom_init_script" || failure="1"
|
||||
else
|
||||
info "Sourcing ${custom_init_script} as it is not executable by the current user, any error may cause initialization to fail"
|
||||
. "$custom_init_script"
|
||||
fi
|
||||
[[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ "$f" == *".sh" ]]; then
|
||||
if [[ -x "$f" ]]; then
|
||||
info "Executing $f"; "$f" || failure=$?
|
||||
else
|
||||
info "Sourcing $f"; . "$f"
|
||||
fi
|
||||
fi
|
||||
if [[ "$failure" -ne 0 ]]; then
|
||||
error "Failed to execute ${f}"
|
||||
exit "$failure"
|
||||
fi
|
||||
exit "$failure"
|
||||
|
|
|
|||
|
|
@ -1,29 +1,46 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Post-init script to execute SQL files with MySQL client
|
||||
# Executes custom Ruby init scripts
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
# set -o xtrace # Uncomment this line for debugging purposes
|
||||
|
||||
. /opt/bitnami/base/functions
|
||||
# Load libraries with logging functions
|
||||
if [[ -f /opt/bitnami/base/functions ]]; then
|
||||
. /opt/bitnami/base/functions
|
||||
else
|
||||
. /opt/bitnami/scripts/liblog.sh
|
||||
fi
|
||||
|
||||
readonly f="${1:?missing SQL file}"
|
||||
failure=0
|
||||
|
||||
if [[ "$f" =~ ^.*(\.sql|\.sql\.gz)$ ]]; then
|
||||
info "Executing $f"
|
||||
mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" )
|
||||
mysql_execute() {
|
||||
local -r sql_file="${1:?missing file}"
|
||||
local failure=0
|
||||
mysql_cmd=("mysql" "-h" "$MARIADB_HOST" "-P" "$MARIADB_PORT_NUMBER" "-u" "$MARIADB_ROOT_USER")
|
||||
if [[ "${ALLOW_EMPTY_PASSWORD:-no}" != "yes" ]]; then
|
||||
mysql_cmd+=( -p"$MARIADB_ROOT_PASSWORD" )
|
||||
mysql_cmd+=("-p${MARIADB_ROOT_PASSWORD}")
|
||||
fi
|
||||
if [[ "$f" == *".sql" ]]; then
|
||||
"${mysql_cmd[@]}" < "$f" || failure=$?
|
||||
elif [[ "$f" == *".sql.gz" ]]; then
|
||||
gunzip -c "$f" | "${mysql_cmd[@]}" || failure=$?
|
||||
if [[ "$sql_file" == *".sql" ]]; then
|
||||
"${mysql_cmd[@]}" < "$sql_file" || failure=$?
|
||||
elif [[ "$sql_file" == *".sql.gz" ]]; then
|
||||
gunzip -c "$sql_file" | "${mysql_cmd[@]}" || failure=$?
|
||||
fi
|
||||
return "$failure"
|
||||
}
|
||||
|
||||
# Loop through all input files passed via stdin
|
||||
read -r -a custom_init_scripts <<< "$@"
|
||||
failure=0
|
||||
if [[ "${#custom_init_scripts[@]}" -gt 0 ]]; then
|
||||
for custom_init_script in "${custom_init_scripts[@]}"; do
|
||||
[[ ! "$custom_init_script" =~ ^.*(\.sql|\.sql\.gz)$ ]] && continue
|
||||
info "Executing ${custom_init_script}"
|
||||
mysql_execute "$custom_init_script" || failure=1
|
||||
[[ "$failure" -ne 0 ]] && error "Failed to execute ${custom_init_script}"
|
||||
done
|
||||
fi
|
||||
if [[ "$failure" -ne 0 ]]; then
|
||||
error "Failed to execute ${f}"
|
||||
exit "$failure"
|
||||
fi
|
||||
|
||||
exit "$failure"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,23 @@
|
|||
#!/bin/bash
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
# set -o xtrace # Uncomment this line for debugging purposes
|
||||
|
||||
. /opt/bitnami/base/functions
|
||||
|
||||
if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f "/bitnami/magento/.user_scripts_initialized" ]]; then
|
||||
for f in /docker-entrypoint-init.d/*; do
|
||||
for p in /post-init.d/*.sh; do
|
||||
"$p" "$f"
|
||||
# Only execute init scripts once
|
||||
if [[ ! -f "/bitnami/magento/.user_scripts_initialized" ]]; then
|
||||
read -r -a init_scripts <<< "$(find "/docker-entrypoint-init.d" -type f -print0 | xargs -0)"
|
||||
if [[ "${#init_scripts[@]}" -gt 0 ]] && [[ ! -f "/bitnami/magento/.user_scripts_initialized" ]]; then
|
||||
mkdir -p "/bitnami/magento"
|
||||
for init_script in "${init_scripts[@]}"; do
|
||||
for init_script_type_handler in /post-init.d/*.sh; do
|
||||
"$init_script_type_handler" "$init_script"
|
||||
done
|
||||
done
|
||||
done
|
||||
info "Custom scripts were executed"
|
||||
fi
|
||||
|
||||
touch "/bitnami/magento/.user_scripts_initialized"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -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/).
|
||||
|
||||
|
||||
* [`2-debian-10`, `2.3.5-debian-10-r55`, `2`, `2.3.5`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.3.5-debian-10-r55/2/debian-10/Dockerfile)
|
||||
* [`2-debian-10`, `2.3.5-debian-10-r56`, `2`, `2.3.5`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.3.5-debian-10-r56/2/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/magento GitHub repo](https://github.com/bitnami/bitnami-docker-magento).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue