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

4.3.1-debian-10-r11 release

Browse Source
This commit is contained in:
Bitnami Bot
2021-06-12 14:10:59 +00:00
parent 36c034d467
commit 6b77c0718f
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/matomo/4/debian-10/Dockerfile
View File

@@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
APACHE_HTTPS_PORT_NUMBER="" \
APACHE_HTTP_PORT_NUMBER="" \
BITNAMI_APP_NAME="matomo" \
BITNAMI_IMAGE_VERSION="4.3.1-debian-10-r10" \
BITNAMI_IMAGE_VERSION="4.3.1-debian-10-r11" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \

4
bitnami/matomo/4/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
View File

@@ -31,7 +31,7 @@ persist_app() {
local -r install_dir="${BITNAMI_ROOT_DIR}/${app}"
local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}"
# Persist the individual files
if [[ "${#files_to_persist[@]}" -lt 0 ]]; then
if [[ "${#files_to_persist[@]}" -le 0 ]]; then
warn "No files are configured to be persisted"
return
fi
@@ -87,7 +87,7 @@ restore_persisted_app() {
local -r install_dir="${BITNAMI_ROOT_DIR}/${app}"
local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}"
# Restore the individual persisted files
if [[ "${#files_to_restore[@]}" -lt 0 ]]; then
if [[ "${#files_to_restore[@]}" -le 0 ]]; then
warn "No persisted files are configured to be restored"
return
fi

3
bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
View File

@@ -433,6 +433,9 @@ EOF
additional_configuration="$(indent $'\n'"$additional_configuration" 2)"
htaccess_include="$(indent $'\n'"$htaccess_include" 2)"
extra_directory_configuration="$(indent $'\n'"$extra_directory_configuration" 4)"
proxy_configuration="$(indent $'\n'"$proxy_configuration" 2)"
proxy_http_configuration="$(indent $'\n'"$proxy_http_configuration" 2)"
proxy_https_configuration="$(indent $'\n'"$proxy_https_configuration" 2)"
# Render templates
# We remove lines that are empty or contain only newspaces with 'sed', so the resulting file looks better
local template_name="app"

11
bitnami/matomo/4/debian-10/rootfs/opt/bitnami/scripts/libmatomo.sh
View File

@@ -50,12 +50,10 @@ matomo_validate() {
fi
}
check_allowed_port() {
check_valid_port() {
local port_var="${1:?missing port variable}"
local -a validate_port_args=()
! am_i_root && validate_port_args+=("-unprivileged")
validate_port_args+=("${!port_var}")
if ! err=$(validate_port "${validate_port_args[@]}"); then
local err
if ! err="$(validate_port "${!port_var}")"; then
print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}."
fi
}
@@ -80,8 +78,7 @@ matomo_validate() {
is_empty_value "${!empty_env_var}" && warn "The ${empty_env_var} environment variable is empty or not set."
done
is_empty_value "$MATOMO_SMTP_PORT_NUMBER" && print_validation_error "The MATOMO_SMTP_PORT_NUMBER environment variable is empty or not set."
! is_empty_value "$MATOMO_SMTP_PORT_NUMBER" && validate_port "$MATOMO_SMTP_PORT_NUMBER"
! is_empty_value "$MATOMO_SMTP_PORT_NUMBER" && check_valid_port "MATOMO_SMTP_PORT_NUMBER"
! is_empty_value "$MATOMO_SMTP_PROTOCOL" && check_multi_value "MATOMO_SMTP_PROTOCOL" "ssl tls none"
! is_empty_value "$MATOMO_SMTP_AUTH" && check_multi_value "MATOMO_SMTP_AUTH" "Plain Login Crammd5"
fi

2
bitnami/matomo/README.md
View File

@@ -36,7 +36,7 @@ Non-root container images add an extra layer of security and are generally recom
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/).
* [`4`, `4-debian-10`, `4.3.1`, `4.3.1-debian-10-r10`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.3.1-debian-10-r10/4/debian-10/Dockerfile)
* [`4`, `4-debian-10`, `4.3.1`, `4.3.1-debian-10-r11`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-matomo/blob/4.3.1-debian-10-r11/4/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/matomo GitHub repo](https://github.com/bitnami/bitnami-docker-matomo).