public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

4.4.0-debian-10-r32 release

This commit is contained in:
Bitnami Bot 2021-06-12 22:22:33 +00:00
parent ca5f962e43
commit 36ca5b1734
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
APACHE_HTTPS_PORT_NUMBER="" \
APACHE_HTTP_PORT_NUMBER="" \
BITNAMI_APP_NAME="osclass" \
BITNAMI_IMAGE_VERSION="4.4.0-debian-10-r31" \
BITNAMI_IMAGE_VERSION="4.4.0-debian-10-r32" \
MARIADB_HOST="mariadb" \
MARIADB_PORT_NUMBER="3306" \
MARIADB_ROOT_PASSWORD="" \

4
bitnami/osclass/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/osclass/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"

15
bitnami/osclass/4/debian-10/rootfs/opt/bitnami/scripts/libosclass.sh
View File

@ -61,11 +61,18 @@ osclass_validate() {
warn "Hostname ${1} could not be resolved, this could lead to connection issues"
fi
}
check_valid_port() {
local port_var="${1:?missing port variable}"
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
}
check_empty_value "OSCLASS_WEB_TITLE"
! is_empty_value "$OSCLASS_SKIP_BOOTSTRAP" && check_yes_no_value "OSCLASS_SKIP_BOOTSTRAP"
! is_empty_value "$OSCLASS_DATABASE_HOST" && check_resolved_hostname "$OSCLASS_DATABASE_HOST"
! is_empty_value "$OSCLASS_DATABASE_PORT_NUMBER" && validate_port "$OSCLASS_DATABASE_PORT_NUMBER"
! is_empty_value "$OSCLASS_DATABASE_PORT_NUMBER" && check_valid_port "OSCLASS_DATABASE_PORT_NUMBER"
# Validate credentials
if is_boolean_yes "${ALLOW_EMPTY_PASSWORD:-}"; then
@ -78,9 +85,11 @@ osclass_validate() {
# Validate SMTP credentials
if ! is_empty_value "$OSCLASS_SMTP_HOST"; then
for empty_env_var in "OSCLASS_SMTP_USER" "OSCLASS_SMTP_PASSWORD" "OSCLASS_SMTP_PORT_NUMBER"; do
is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set."
for empty_env_var in "OSCLASS_SMTP_USER" "OSCLASS_SMTP_PASSWORD"; do
is_empty_value "${!empty_env_var}" && warn "The ${empty_env_var} environment variable is empty or not set."
done
is_empty_value "$OSCLASS_SMTP_PORT_NUMBER" && warn "The OSCLASS_SMTP_PORT_NUMBER environment variable is empty or not set."
! is_empty_value "$OSCLASS_SMTP_PORT_NUMBER" && check_valid_port "OSCLASS_SMTP_PORT_NUMBER"
! is_empty_value "$OSCLASS_SMTP_PROTOCOL" && check_multi_value "OSCLASS_SMTP_PROTOCOL" "ssl tls"
fi

2
bitnami/osclass/README.md
View File

@ -41,7 +41,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/).
- [`4`, `4-debian-10`, `4.4.0`, `4.4.0-debian-10-r31`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/4.4.0-debian-10-r31/4/debian-10/Dockerfile)
- [`4`, `4-debian-10`, `4.4.0`, `4.4.0-debian-10-r32`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/4.4.0-debian-10-r32/4/debian-10/Dockerfile)
Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).