mirror of
https://github.com/bitnami/containers.git
synced 2026-03-14 06:48:11 +08:00
8.0.0-debian-10-r50 release
This commit is contained in:
Bitnami Bot
committed by
Bitnami Containers
Bitnami Containers
parent
0bcd43b3b2
commit
48cce9922c
@@ -10,15 +10,15 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
|
||||
|
||||
COPY prebuildfs /
|
||||
# Install required system packages and dependencies
|
||||
RUN install_packages acl ca-certificates curl fontconfig gzip libaudit1 libc6 libcap-ng0 libcom-err2 libcurl4 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libxml2 procps tar xmlstarlet zlib1g libedit2
|
||||
RUN install_packages acl ca-certificates curl fontconfig gzip libaudit1 libbsd0 libc6 libcap-ng0 libcom-err2 libcurl4 libedit2 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps tar xmlstarlet zlib1g
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.332-0" --checksum ea45a7908b8a86363659aa7e3953a1308af86db3ffa1656e46036c8e1f7c659a
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "9.0.62-0" --checksum 19b1e7b113180f5a17a1155d36a23d5da65e741337d8f89c0e97a9fb6535921c
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "tomcat" "9.0.63-0" --checksum cb374369f41bd7594c4b6e112dc471a5e4663db192b6d4565c585a3cef74481b
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "11.16.0-0" --checksum d79676cf09b1852d4dd1d26c0643f09c67f9ed63f3895f21fa87cc65484a432a
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.6.7-4" --checksum 14329a8ec0a649ecb9ffb37085a547183748efedea8ed029801ab9b381ab7173
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.36.1-0" --checksum e00f740b66faf2808cb8983a39b186d43a8367730512c402df78751a9cefbfc1
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-10" --checksum 97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.3-0" --checksum af5ec81cfb8e8420fe6af80a77d40da25e0f7e136abb6dde27267c97fb27cf8b
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "jasperreports" "8.0.0-34" --checksum f6305c16737954ec737ca27ac6d8df7da0a77f232ecc3183d447842912e2a846
|
||||
RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.6.0-5" --checksum ef8f465e059e386aa96e44ba6787ed68ba4bd80c8e73681672b760c8d3114bff
|
||||
RUN apt-get update && apt-get upgrade -y && \
|
||||
rm -r /var/lib/apt/lists /var/cache/apt/archives
|
||||
RUN chmod g+rwX /opt/bitnami
|
||||
@@ -31,7 +31,7 @@ RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
|
||||
ENV APP_VERSION="8.0.0" \
|
||||
BITNAMI_APP_NAME="jasperreports" \
|
||||
JAVA_HOME="/opt/bitnami/java" \
|
||||
PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/mysql/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/git/bin:$PATH"
|
||||
PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/tomcat/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/mysql/bin:/opt/bitnami/git/bin:$PATH"
|
||||
|
||||
EXPOSE 8009 8080 8443
|
||||
|
||||
|
||||
@@ -34,18 +34,25 @@
|
||||
"type": "NAMI",
|
||||
"version": "10.6.7-4"
|
||||
},
|
||||
"render-template": {
|
||||
"postgresql-client": {
|
||||
"arch": "amd64",
|
||||
"digest": "97c2ae4b001c5937e888b920bee7b1a40a076680caac53ded6d10f6207d54565",
|
||||
"digest": "d79676cf09b1852d4dd1d26c0643f09c67f9ed63f3895f21fa87cc65484a432a",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.1-10"
|
||||
"version": "11.16.0-0"
|
||||
},
|
||||
"render-template": {
|
||||
"arch": "amd64",
|
||||
"digest": "af5ec81cfb8e8420fe6af80a77d40da25e0f7e136abb6dde27267c97fb27cf8b",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.3-0"
|
||||
},
|
||||
"tomcat": {
|
||||
"arch": "amd64",
|
||||
"digest": "19b1e7b113180f5a17a1155d36a23d5da65e741337d8f89c0e97a9fb6535921c",
|
||||
"digest": "cb374369f41bd7594c4b6e112dc471a5e4663db192b6d4565c585a3cef74481b",
|
||||
"distro": "debian-10",
|
||||
"type": "NAMI",
|
||||
"version": "9.0.62-0"
|
||||
"version": "9.0.63-0"
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,7 @@ jasperreports_env_vars=(
|
||||
JASPERREPORTS_SMTP_USER
|
||||
JASPERREPORTS_SMTP_PASSWORD
|
||||
JASPERREPORTS_SMTP_PROTOCOL
|
||||
JASPERREPORTS_DATABASE_TYPE
|
||||
JASPERREPORTS_DATABASE_HOST
|
||||
JASPERREPORTS_DATABASE_PORT_NUMBER
|
||||
JASPERREPORTS_DATABASE_NAME
|
||||
|
||||
@@ -18,9 +18,8 @@ set -o pipefail
|
||||
print_welcome_page
|
||||
|
||||
if [[ "$1" = "/opt/bitnami/scripts/tomcat/run.sh" ]]; then
|
||||
/opt/bitnami/scripts/postgresql-client/setup.sh
|
||||
/opt/bitnami/scripts/mysql-client/setup.sh
|
||||
|
||||
/opt/bitnami/scripts/postgresql-client/setup.sh
|
||||
# For compatibility with previous Helm charts, disable Tomcat auth by default
|
||||
TOMCAT_ENABLE_AUTH="${TOMCAT_ENABLE_AUTH:-no}" /opt/bitnami/scripts/tomcat/setup.sh
|
||||
/opt/bitnami/scripts/jasperreports/setup.sh
|
||||
|
||||
@@ -19,7 +19,7 @@ elif [[ -f /opt/bitnami/scripts/mariadb-env.sh ]]; then
|
||||
. /opt/bitnami/scripts/mariadb-env.sh
|
||||
fi
|
||||
|
||||
# Load PostgreSQL client environment for 'postgresql_remote_execute'
|
||||
# Load PostgreSQL client environment for 'postgresql_remote_execute' (after 'jasperreports-env.sh' so that MODULE is not set to a wrong value)
|
||||
if [[ -f /opt/bitnami/scripts/postgresql-client-env.sh ]]; then
|
||||
. /opt/bitnami/scripts/postgresql-client-env.sh
|
||||
elif [[ -f /opt/bitnami/scripts/postgresql-env.sh ]]; then
|
||||
|
||||
@@ -128,9 +128,9 @@ jasperreports_configure_db() {
|
||||
! is_boolean_yes "$ALLOW_EMPTY_PASSWORD" && jasperreports_conf_set "dbPassword" "$JASPERREPORTS_DATABASE_PASSWORD"
|
||||
jasperreports_conf_set "dbUsername" "$JASPERREPORTS_DATABASE_USER"
|
||||
jasperreports_conf_set "js.dbName" "$JASPERREPORTS_DATABASE_NAME"
|
||||
|
||||
# Extract DB client version from the library jar. We do it at initialization time to avoid issues when updating
|
||||
|
||||
if [[ "$db_type" = "postgresql" ]]; then
|
||||
# Extract PostgreSQL client version from the library jar. We do it at initialization time to avoid issues when updating
|
||||
local -r postgresql_client_jar="$(realpath "${JASPERREPORTS_CONF_DIR}/conf_source/db/postgresql/jdbc"/postgresql-*)"
|
||||
client_version="${postgresql_client_jar##*-}"
|
||||
client_version="${client_version%.jar}"
|
||||
@@ -145,7 +145,6 @@ jasperreports_configure_db() {
|
||||
jasperreports_conf_set "maven.jdbc.groupId" "org.postgresql"
|
||||
jasperreports_conf_set "maven.jdbc.artifactId" "postgresql"
|
||||
else
|
||||
|
||||
# Extract MariaDB client version from the library jar. We do it at initialization time to avoid issues when updating
|
||||
local -r mariadb_client_jar="$(realpath "${JASPERREPORTS_CONF_DIR}/conf_source/db/mysql/jdbc"/mariadb-java-client-*)"
|
||||
client_version="${mariadb_client_jar##*-}"
|
||||
@@ -374,6 +373,15 @@ jasperreports_initialize() {
|
||||
info "Persisting JasperReports installation"
|
||||
persist_app "$app_name" "$JASPERREPORTS_DATA_TO_PERSIST"
|
||||
else
|
||||
# Compatibility with previous container images for newly added persisted file
|
||||
local -r postgresql_conf_file="buildomatic/conf_source/db/postgresql/db.template.properties"
|
||||
if [[ " ${JASPERREPORTS_DATA_TO_PERSIST} " = *" ${postgresql_conf_file} "* && ! -e "${JASPERREPORTS_VOLUME_DIR}/${postgresql_conf_file}" ]]; then
|
||||
warn "Could not find required file ${JASPERREPORTS_VOLUME_DIR}/${postgresql_conf_file}, it will be created"
|
||||
ensure_dir_exists "$(dirname "${JASPERREPORTS_VOLUME_DIR}/${postgresql_conf_file}")"
|
||||
am_i_root && configure_permissions_ownership "$(dirname "${JASPERREPORTS_VOLUME_DIR}/${postgresql_conf_file}")" -d "775" -f "664" -u "$JASPERREPORTS_DAEMON_USER" -g "root"
|
||||
cp "${JASPERREPORTS_BASE_DIR}/${postgresql_conf_file}" "${JASPERREPORTS_VOLUME_DIR}/${postgresql_conf_file}"
|
||||
fi
|
||||
|
||||
info "Restoring persisted JasperReports installation"
|
||||
restore_persisted_app "$app_name" "$JASPERREPORTS_DATA_TO_PERSIST"
|
||||
info "Trying to connect to the database server"
|
||||
|
||||
@@ -9,47 +9,6 @@
|
||||
. /opt/bitnami/scripts/libos.sh
|
||||
. /opt/bitnami/scripts/libvalidations.sh
|
||||
|
||||
########################
|
||||
# Checks if PostgreSQL is running
|
||||
# Globals:
|
||||
# DB_TMP_DIR
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# Boolean
|
||||
#########################
|
||||
is_postgresql_running() {
|
||||
local pid
|
||||
pid="$(get_pid_from_file "$DB_PID_FILE")"
|
||||
|
||||
if [[ -z "$pid" ]]; then
|
||||
false
|
||||
else
|
||||
is_service_running "$pid"
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Wait for PostgreSQL to be running
|
||||
# Globals:
|
||||
# DB_TMP_DIR
|
||||
# DB_STARTUP_WAIT_RETRIES
|
||||
# DB_STARTUP_WAIT_SLEEP_TIME
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# Boolean
|
||||
#########################
|
||||
wait_for_postgresql() {
|
||||
local pid
|
||||
local -r retries="${DB_STARTUP_WAIT_RETRIES:-300}"
|
||||
local -r sleep_time="${DB_STARTUP_WAIT_SLEEP_TIME:-2}"
|
||||
if ! retry_while is_postgresql_running "$retries" "$sleep_time"; then
|
||||
error "PostgreSQL failed to start"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Validate settings in POSTGRESQL_CLIENT_* environment variables
|
||||
# Globals:
|
||||
|
||||
@@ -64,15 +64,9 @@ export PATH="${POSTGRESQL_BIN_DIR}:${PATH}"
|
||||
# PostgreSQL settings
|
||||
export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}"
|
||||
POSTGRESQL_CLIENT_DATABASE_HOST="${POSTGRESQL_CLIENT_DATABASE_HOST:-"${POSTGRESQL_HOST:-}"}"
|
||||
export POSTGRESQL_CLIENT_DATABASE_HOST="${POSTGRESQL_CLIENT_DATABASE_HOST:-postgres}"
|
||||
export POSTGRESQL_CLIENT_DATABASE_HOST="${POSTGRESQL_CLIENT_DATABASE_HOST:-postgresql}"
|
||||
POSTGRESQL_CLIENT_DATABASE_PORT_NUMBER="${POSTGRESQL_CLIENT_DATABASE_PORT_NUMBER:-"${POSTGRESQL_PORT_NUMBER:-}"}"
|
||||
export POSTGRESQL_CLIENT_DATABASE_PORT_NUMBER="${POSTGRESQL_CLIENT_DATABASE_PORT_NUMBER:-5432}"
|
||||
POSTGRESQL_CLIENT_DATABASE_ROOT_USER="${POSTGRESQL_CLIENT_DATABASE_ROOT_USER:-"${POSTGRESQL_ROOT_USER:-}"}"
|
||||
export POSTGRESQL_CLIENT_DATABASE_ROOT_USER="${POSTGRESQL_CLIENT_DATABASE_ROOT_USER:-postgres}"
|
||||
export DB_ROOT_USER="$POSTGRESQL_CLIENT_DATABASE_ROOT_USER" # only used during the first initialization
|
||||
POSTGRESQL_CLIENT_DATABASE_ROOT_PASSWORD="${POSTGRESQL_CLIENT_DATABASE_ROOT_PASSWORD:-"${POSTGRESQL_ROOT_PASSWORD:-}"}"
|
||||
export POSTGRESQL_CLIENT_DATABASE_ROOT_PASSWORD="${POSTGRESQL_CLIENT_DATABASE_ROOT_PASSWORD:-}"
|
||||
export DB_ROOT_PASSWORD="$POSTGRESQL_CLIENT_DATABASE_ROOT_PASSWORD" # only used during the first initialization
|
||||
POSTGRESQL_CLIENT_POSTGRES_USER="${POSTGRESQL_CLIENT_POSTGRES_USER:-"${POSTGRESQL_CLIENT_ROOT_USER:-}"}"
|
||||
POSTGRESQL_CLIENT_POSTGRES_USER="${POSTGRESQL_CLIENT_POSTGRES_USER:-"${POSTGRESQL_POSTGRES_USER:-}"}"
|
||||
POSTGRESQL_CLIENT_POSTGRES_USER="${POSTGRESQL_CLIENT_POSTGRES_USER:-"${POSTGRESQL_ROOT_USER:-}"}"
|
||||
|
||||
Reference in New Issue
Block a user