Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bitnami/suitecrm] Release suitecrm-7.14.5-debian-12-r7 #74085

Merged
merged 1 commit into from
Oct 31, 2024
Merged

[bitnami/suitecrm] Release suitecrm-7.14.5-debian-12-r7 #74085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bitnami/suitecrm/7/debian-12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ ARG TARGETARCH

LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2024-10-26T06:28:17Z" \
org.opencontainers.image.created="2024-10-31T15:31:45Z" \
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/suitecrm/README.md" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="7.14.5-debian-12-r6" \
org.opencontainers.image.ref.name="7.14.5-debian-12-r7" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/suitecrm" \
org.opencontainers.image.title="suitecrm" \
org.opencontainers.image.vendor="Broadcom, Inc." \
Expand All @@ -29,11 +29,11 @@ RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
COMPONENTS=( \
"render-template-1.0.7-6-linux-${OS_ARCH}-debian-12" \
"php-8.1.30-5-linux-${OS_ARCH}-debian-12" \
"php-8.1.30-6-linux-${OS_ARCH}-debian-12" \
"apache-2.4.62-4-linux-${OS_ARCH}-debian-12" \
"mysql-client-11.4.3-1-linux-${OS_ARCH}-debian-12" \
"libphp-8.1.30-1-linux-${OS_ARCH}-debian-12" \
"suitecrm-7.14.5-1-linux-${OS_ARCH}-debian-12" \
"suitecrm-7.14.5-2-linux-${OS_ARCH}-debian-12" \
) ; \
for COMPONENT in "${COMPONENTS[@]}"; do \
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
Expand Down
4 changes: 2 additions & 2 deletions bitnami/suitecrm/7/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "8.1.30-5"
"version": "8.1.30-6"
},
"render-template": {
"arch": "amd64",
Expand All @@ -33,6 +33,6 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "7.14.5-1"
"version": "7.14.5-2"
}
}
17 changes: 10 additions & 7 deletions bitnami/suitecrm/7/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ suitecrm_validate() {
#########################
suitecrm_initialize() {
# Check if SuiteCRM has already been initialized and persisted in a previous run
local db_host db_port db_name db_user db_pass
local db_host db_port db_name db_user db_pass cron_script
local -r app_name="suitecrm"
if ! is_app_initialized "$app_name"; then
# Ensure SuiteCRM persisted directories exist (i.e. when a volume has been mounted to /bitnami)
Expand Down Expand Up @@ -144,14 +144,14 @@ suitecrm_initialize() {
# Delete configuration file for silent install as it's not needed anymore
rm "$SUITECRM_SILENT_INSTALL_CONF_FILE"
else
web_server_start
suitecrm_pass_wizard
# Configure SMTP via application wizard
if ! is_empty_value "$SUITECRM_SMTP_HOST"; then
web_server_start
info "Configuring SMTP"
suitecrm_pass_smtp_wizard
web_server_stop
fi
web_server_stop
fi

else
Expand Down Expand Up @@ -186,9 +186,11 @@ suitecrm_initialize() {

# Ensure SuiteCRM cron jobs are created when running setup with a root user
# https://docs.suitecrm.com/blog/scheduler-jobs/
local -a cron_cmd=(cd "${SUITECRM_BASE_DIR};" "${PHP_BIN_DIR}/php" "-f" "cron.php")
cron_script="${SUITECRM_BASE_DIR}/cron.php"
[[ "$(get_sematic_version "$APP_VERSION" 1)" -ge 8 ]] && cron_script="${SUITECRM_BASE_DIR}/public/legacy/cron.php"
local -a cron_cmd=("${PHP_BIN_DIR}/php" "$cron_script")
if am_i_root; then
generate_cron_conf "suitecrm" "${cron_cmd[*]} > /dev/null 2>&1" --run-as "$WEB_SERVER_DAEMON_USER" --schedule "*/1 * * * *"
generate_cron_conf "suitecrm" "${cron_cmd[*]} > /dev/null 2>&1" --run-as "$WEB_SERVER_DAEMON_USER" --schedule "* * * * *"
else
warn "Skipping cron configuration for SuiteCRM because of running as a non-root user"
fi
Expand Down Expand Up @@ -358,11 +360,12 @@ suitecrm_pass_smtp_wizard() {
suitecrm_pass_wizard() {
local -a install_args
local url_protocol=http
local -r url_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
info "Running setup wizard"
is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https
is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https url_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"

install_args=(
"--site_host=${url_protocol}://${SUITECRM_HOST}"
"--site_host=${url_protocol}://${SUITECRM_HOST}:${url_port}"
"--site_username=${SUITECRM_USERNAME}"
"--site_password=${SUITECRM_PASSWORD}"
"--db_username=${SUITECRM_DATABASE_USER}"
Expand Down
Loading